Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v0.10'
Browse files Browse the repository at this point in the history
Conflicts:
	AUTHORS
	ChangeLog
	src/node_version.h
  • Loading branch information
tjfontaine committed May 1, 2014
2 parents b19b60a + 1285008 commit 8637a40
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -538,3 +538,6 @@ Saúl Ibarra Corretgé <[email protected]>
Greg Brail <[email protected]>
Shuhei Kagawa <[email protected]>
Yuriy Nemtsov <[email protected]>
Josh Dague <[email protected]>
Goh Yisheng (Andrew) <[email protected]>
William Bert <[email protected]>
33 changes: 33 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,39 @@
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)


2014.05.01, Version 0.10.27 (Stable), cb7911f78ae96ef7a540df992cc1359ba9636e86

* npm: upgrade to v1.4.8

* openssl: upgrade to 1.0.1g

* uv: update to v0.10.27

* dns: fix certain txt entries (Fedor Indutny)

* assert: Ensure reflexivity of deepEqual (Mike Pennisi)

* child_process: fix deadlock when sending handles (Fedor Indutny)

* child_process: fix sending handle twice (Fedor Indutny)

* crypto: do not lowercase cipher/hash names (Fedor Indutny)

* dtrace: workaround linker bug on FreeBSD (Fedor Indutny)

* http: do not emit EOF non-readable socket (Fedor Indutny)

* http: invoke createConnection when no agent (Nathan Rajlich)

* stream: remove useless check (Brian White)

* timer: don't reschedule timer bucket in a domain (Greg Brail)

* url: treat \ the same as / (isaacs)

* util: format as Error if instanceof Error (Rod Vagg)


2014.02.18, Version 0.10.26 (Stable), cc56c62ed879ad4f93b1fdab3235c43e60f48b7e

* uv: Upgrade to v0.10.25 (Timothy J Fontaine)
Expand Down

0 comments on commit 8637a40

Please sign in to comment.