Julien Gilli 0c7f6ca830 Merge remote-tracking branch 'upstream/v0.10' into merge-0-10-into-0-12 ...

Conflicts:
	AUTHORS
	ChangeLog
	configure
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/README.md
	deps/uv/config-unix.mk
	deps/uv/include/uv-private/uv-win.h
	deps/uv/include/uv.h
	deps/uv/src/unix/internal.h
	deps/uv/src/unix/kqueue.c
	deps/uv/src/unix/stream.c
	deps/uv/src/uv-common.c
	deps/uv/src/uv-common.h
	deps/uv/src/version.c
	deps/uv/src/win/poll.c
	deps/uv/test/test-osx-select.c
	deps/v8/src/debug-debugger.js
	deps/v8/src/isolate.cc
	deps/v8/src/isolate.h
	deps/v8/src/mirror-debugger.js
	doc/api/buffer.markdown
	doc/api/child_process.markdown
	doc/api/dns.markdown
	doc/api/tls.markdown
	doc/api/url.markdown
	lib/_stream_writable.js
	lib/assert.js
	lib/child_process.js
	lib/crypto.js
	lib/dgram.js
	lib/http.js
	lib/net.js
	lib/timers.js
	lib/tls.js
	src/node.cc
	src/node.h
	src/node.js
	src/node_crypto.cc
	src/node_version.h
	test/common.js
	test/simple/test-child-process-spawn-typeerror.js
	tools/certdata.txt

2015-01-12 15:59:37 -08:00

..

internet.status

test: mark current flaky tests as flaky

2014-12-04 17:22:15 +01:00

test-dgram-multicast-multi-process.js

test: add reuseAddr in dgram-multicast...

2014-04-10 19:55:38 +04:00

test-dns.js

src: all wrap's now use actual FunctionTemplate

2014-12-05 04:52:42 -08:00

test-http-dns-fail.js

test: move simple/test-http-dns-fail to test/internet

2013-01-28 12:41:56 +01:00

test-http-https-default-ports.js

https: fix default port

2013-08-05 12:53:12 -07:00

test-https-aws-ssl.js

src: re-add 1024-bit SSL certs removed by f9456a2

2014-12-19 17:11:40 -08:00

test-net-connect-timeout.js

test: Move test-net-connect-timeout to test/internet

2013-02-26 17:39:04 -08:00

test-net-connect-unref.js

test: move two tests from simple/ to internet/

2013-07-20 12:36:33 +02:00

test-tls-reuse-host-from-socket.js

tls: reuse hostname from underlying net.Socket

2013-10-31 01:57:17 +04:00

testcfg.py

test: refactor to use common testcfg

2014-01-20 09:00:13 -08:00