Skip to content

Commit 667aae5

Browse files
committed
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
2 parents 2433eeb + 6c0c00a commit 667aae5

File tree

73 files changed

+1874
-385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1874
-385
lines changed

AUTHORS

+5
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,8 @@ Dave Irvine <[email protected]>
253253
Ju-yeong Park <[email protected]>
254254
Phil Sung <[email protected]>
255255
Damon Oehlman <[email protected]>
256+
Ryunosuke SATO <[email protected]>
257+
Michael Bernstein <[email protected]>
258+
Guillermo Rauch <[email protected]>
259+
Dan Williams <[email protected]>
260+
Brandon Benvie <[email protected]>

ChangeLog

+26-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,32 @@
1313
* Bug fixes
1414

1515

16-
2012.01.06, Version 0.6.7 (stable)
16+
2012.01.19, Version 0.6.8 (stable)
17+
18+
* Update V8 to 3.6.6.19
19+
20+
* Numeric key hash collision fix for V8 (Erik Corry, Fedor Indutny)
21+
22+
* Add missing TTY key translations for F1-F5 on Windows (Brandon Benvie)
23+
24+
* path.extname bugfix with . and .. paths (Bert Belder)
25+
26+
* cluster: don't always kill the master on uncaughtException (Ben Noordhuis)
27+
28+
* Update npm to 1.1.0-2 (isaacs)
29+
30+
* typed arrays: set class name (Ben Noordhuis)
31+
32+
* zlib binding cleanup (isaacs, Bert Belder)
33+
34+
* dgram: use slab memory allocator (Michael Bernstein)
35+
36+
* fix segfault #2473
37+
38+
* #2521 60% improvement in fs.stat on Windows (Igor Zinkovsky)
39+
40+
41+
2012.01.06, Version 0.6.7 (stable), d5a189acef14a851287ee555f7a39431fe276e1c
1742

1843
* V8 hash collision fix (Breaks MIPS) (Bert Belder, Erik Corry)
1944

0 commit comments

Comments
 (0)