2 Commits

Author	SHA1	Message	Date
Ben Noordhuis	94e147500c	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>	2015-01-05 17:26:47 +01:00
Fedor Indutny	0e19476595	test: split test in parallel/sequential ... Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> PR-URL: https://github.com/iojs/io.js/pull/172 Fix: iojs/io.js#139	2014-12-17 20:45:02 +07:00