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
nodejs · Jan 23, 2012 · 667aae5 · 667aae5
2 parents 2433eeb + 6c0c00a
commit 667aae5
Show file tree

Hide file tree

Showing 73 changed files with 1,874 additions and 385 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -253,3 +253,8 @@ Dave Irvine <davman99@gmail.com>
 Ju-yeong Park <interruptz@gmail.com>
 Phil Sung <psung@dnanexus.com>
 Damon Oehlman <damon.oehlman@sidelab.com>
+Ryunosuke SATO <tricknotes.rs@gmail.com>
+Michael Bernstein <michaelrbernstein@gmail.com>
+Guillermo Rauch <rauchg@gmail.com>
+Dan Williams <dan@igniter.com>
+Brandon Benvie <brandon@bbenvie.com>
diff --git a/ChangeLog b/ChangeLog
@@ -13,7 +13,32 @@
 * Bug fixes
 
 
-2012.01.06, Version 0.6.7 (stable)
+2012.01.19, Version 0.6.8 (stable)
+
+* Update V8 to 3.6.6.19
+
+* Numeric key hash collision fix for V8 (Erik Corry, Fedor Indutny)
+
+* Add missing TTY key translations for F1-F5 on Windows (Brandon Benvie)
+
+* path.extname bugfix with . and .. paths (Bert Belder)
+
+* cluster: don't always kill the master on uncaughtException (Ben Noordhuis)
+
+* Update npm to 1.1.0-2 (isaacs)
+
+* typed arrays: set class name (Ben Noordhuis)
+
+* zlib binding cleanup (isaacs, Bert Belder)
+
+* dgram: use slab memory allocator (Michael Bernstein)
+
+* fix segfault #2473
+
+* #2521 60% improvement in fs.stat on Windows (Igor Zinkovsky)
+
+
+2012.01.06, Version 0.6.7 (stable), d5a189acef14a851287ee555f7a39431fe276e1c
 
 * V8 hash collision fix (Breaks MIPS) (Bert Belder, Erik Corry)