Skip to content
This repository has been archived by the owner on Jul 31, 2018. It is now read-only.

Just clean some code #208

Merged
merged 3 commits into from
Mar 4, 2016
Merged

Just clean some code #208

merged 3 commits into from
Mar 4, 2016

Conversation

nono
Copy link
Member

@nono nono commented Feb 23, 2016

No description provided.

Frank Rousseau and others added 2 commits February 23, 2016 19:11
@nono
Copy link
Member Author

nono commented Feb 24, 2016

Travis build is red but it seems it's not related to this PR but it's from before. I can see that #207 has already a red build.

newPwd = cryptoTools.encrypt slaveKey, password
return newPwd
else
sendMail()
err = new Error "master key and slave key don't exist"
err = new Error "slave key does not exist"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't is better than does not.

@nono
Copy link
Member Author

nono commented Feb 24, 2016

Well, I think it's coming from the release of node 0.10.42 and the upgrade of http-parser: https://nodejs.org/en/blog/release/v0.10.42/

@nono
Copy link
Member Author

nono commented Feb 26, 2016

There were two fixes for http-parser: one for node 0.10 and one for node 0.12. I really hope that the next versions of node 0.10 & 0.12 will fix our travis build.

@nono
Copy link
Member Author

nono commented Mar 4, 2016

And the build is green! New versions of node 0.10 and node 0.12 have been released (with a fix for http-parser), I've relaunched the build for them and it works. This PR can be reviewed/merged.

aenario added a commit that referenced this pull request Mar 4, 2016
@aenario aenario merged commit 8fbfb8e into cozy:development Mar 4, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants