Commit Graph

4 Commits (1665b4a2a3bb35b24ca65b5797904aa47ce1a908)

Author SHA1 Message Date
Fedor Indutny 667aae596c Merge branch 'v0.6'
Conflicts:
	ChangeLog
	doc/template.html
	lib/cluster.js
	lib/http.js
	lib/tls.js
	src/node.h
	src/node_version.h
	test/simple/test-cluster-kill-workers.js
2012-01-24 00:30:28 +06:00
Andreas Madsen 4865063924 Tests: fix jslint issues 2012-01-17 19:45:09 +01:00
Maciej Małecki 39484f49ef test tls: make tests use new `tls.connect` API
Refs #1983.
2012-01-08 11:13:28 +01:00
koichik f53d092a2a tls, https: add passphrase option
Fixes #1925.
2011-10-31 17:36:43 +09:00