projects / platform / upstream / nodejs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 261706e 372a2f5)
Merge remote-tracking branch 'joyent/v0.12' into v1.x
authorBen Noordhuis <info@bnoordhuis.nl>
Mon, 5 Jan 2015 15:43:58 +0000 (16:43 +0100)
committerBen Noordhuis <info@bnoordhuis.nl>
Mon, 5 Jan 2015 16:26:47 +0000 (17:26 +0100)
commit94e147500c5bf457c9101bda8c8020d8ff896708
tree7cdea05267b4d7c118bab4902c8ccc76216128f3tree | snapshot
parent261706e2ef9f12131ddcf8ff40fd4c7823693e8dcommit | diff
parent372a2f56bed341a23c435c5a94fbb77dbbd6c600commit | diff
Merge remote-tracking branch 'joyent/v0.12' into v1.x

I was originally going to do this after the v0.11.15 release, but as
that release is three weeks overdue now, I decided not to wait any
longer; we don't want the delta to get too big.

Conflicts:
lib/net.js
test/simple/simple.status

PR-URL: https://github.com/iojs/io.js/pull/236
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
16 files changed:
.gitignore diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
README.md diff1 | diff2 | blob | history
configure diff1 | diff2 | blob | history
doc/api/fs.markdown diff1 | diff2 | blob | history
lib/_debugger.js diff1 | diff2 | blob | history
lib/_stream_writable.js diff1 | diff2 | blob | history
lib/net.js diff1 | diff2 | blob | history
lib/url.js diff1 | diff2 | blob | history
node.gyp diff1 | diff2 | blob | history
src/smalloc.cc diff1 | diff2 | blob | history
test/parallel/test-intl.js | diff2 | blob | history
test/parallel/test-net-localerror.js diff1 | diff2 | blob | history
test/parallel/test-process-active-wraps.js diff1 | diff2 | blob | history
test/parallel/test-stream2-transform.js diff1 | diff2 | blob | history
vcbuild.bat diff1 | diff2 | blob | history
Domain: Web Framework / Common;