Skip to content

Commit

Permalink
Merge 537a32f into faf2199
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrussalem committed Apr 19, 2018
2 parents faf2199 + 537a32f commit 6595d17
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -483,3 +483,7 @@
----------------

- use request@2.81.0 for Node 0.10 compatibility

2.21.3 2018-04-18
-----------------
- Increase happn client login timeout to 60000.
2 changes: 1 addition & 1 deletion lib/client/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@
options = {};//skip sending up the options
} else message.options = options;

if (!options.timeout) options.timeout = 20000;//this is not used on the server side
if (!options.timeout) options.timeout = 50000;//this is not used on the server side

message.protocol = PROTOCOL;

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "happn",
"description": "pub/sub api as a service using primus and mongo & redis or nedb, can work as cluster, single process or embedded using nedb, use in production at your own risk",
"version": "2.21.2",
"version": "2.21.3",
"main": "./lib/index",
"protocol": "1.1.0",
"scripts": {
Expand Down

0 comments on commit 6595d17

Please sign in to comment.