projects / platform / upstream / nodejs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f153d6d 21265e2)
Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 25 Oct 2013 18:26:05 +0000 (11:26 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 25 Oct 2013 18:26:05 +0000 (11:26 -0700)
commit61ccaf9a974bedf54622a1d6ad6b6ad00f95f5a5
tree1dc52d619bd9ad2424bae83d66c837e7eea6ba06tree | snapshot
parentf153d6da450b6ba5c78381e6e90a7ba243657691commit | diff
parent21265e20d3be515733418c5eef395ccec8f5f701commit | diff
Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
ChangeLog
deps/uv/ChangeLog
deps/uv/include/uv-darwin.h
deps/uv/src/unix/fsevents.c
deps/uv/src/unix/process.c
deps/uv/src/version.c
doc/api/addons.markdown
doc/api/cluster.markdown
doc/api/http.markdown
lib/http.js
lib/tls.js
src/node_crypto.cc
src/node_http_parser.cc
src/node_version.h
src/pipe_wrap.cc
src/v8abbr.h
src/v8ustack.d
test/simple/test-http-pipeline-flood.js
17 files changed:
ChangeLog diff1 | diff2 | blob | history
README.md diff1 | diff2 | blob | history
doc/api/addons.markdown diff1 | diff2 | blob | history
doc/api/child_process.markdown diff1 | diff2 | blob | history
doc/api/cluster.markdown diff1 | diff2 | blob | history
doc/api/fs.markdown diff1 | diff2 | blob | history
doc/api/http.markdown diff1 | diff2 | blob | history
doc/api/net.markdown diff1 | diff2 | blob | history
doc/api/os.markdown diff1 | diff2 | blob | history
doc/api/stream.markdown diff1 | diff2 | blob | history
lib/_debugger.js diff1 | diff2 | blob | history
lib/_tls_legacy.js diff1 | | blob | history
lib/fs.js diff1 | diff2 | blob | history
src/node_crypto.cc diff1 | diff2 | blob | history
src/node_file.cc diff1 | diff2 | blob | history
src/pipe_wrap.cc diff1 | diff2 | blob | history
test/simple/test-crypto-verify-failure.js | diff2 | blob | history
Domain: Web Framework / Common;