Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 10 Jun 2014 23:36:04 +0000 (19:36 -0400)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 10 Jun 2014 23:36:04 +0000 (19:36 -0400)
commit1a09da6ec219883668564d5d6cd30e8867d7e97d
treefda9b632fa5ab280286a2f0c1076bbaa008be362
parentab50fad63bcbedd7c935a9c5d2ab9e4c7202c9f2
parent1cb6f1a46ad24c60ab1fccfa3f88aad9401e6444
Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
AUTHORS
ChangeLog
deps/v8/src/api.cc
deps/v8/src/unicode-inl.h
deps/v8/src/unicode.h
lib/_stream_readable.js
lib/http.js
src/cares_wrap.cc
src/node.cc
src/node_crypto.cc
src/node_dtrace.cc
src/node_file.cc
src/node_stat_watcher.cc
src/node_version.h
src/process_wrap.cc
src/string_bytes.cc
src/string_bytes.h
src/udp_wrap.cc
src/util.h
test/simple/test-buffer.js
test/simple/test-stream2-compatibility.js
28 files changed:
AUTHORS
ChangeLog
lib/_http_server.js
lib/_stream_readable.js
lib/fs.js
lib/string_decoder.js
node.gyp
src/cares_wrap.cc
src/fs_event_wrap.cc
src/node.cc
src/node_buffer.cc
src/node_crypto.cc
src/node_dtrace.cc
src/node_file.cc
src/node_stat_watcher.cc
src/pipe_wrap.cc
src/process_wrap.cc
src/string_bytes.cc
src/string_bytes.h
src/tcp_wrap.cc
src/tls_wrap.cc
src/udp_wrap.cc
src/util.cc
src/util.h
test/disabled/test-http-abort-stream-end.js
test/simple/test-buffer.js
test/simple/test-stdout-close-unref.js
test/simple/test-stream2-readable-legacy-drain.js