summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog32
-rw-r--r--benchmark/http_simple_cluster.js2
-rw-r--r--doc/community/index.html2
4 files changed, 36 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 55eeabdc2f..e40c249f1d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -325,6 +325,7 @@ Garen Torikian <gjtorikian@gmail.com>
EungJun Yi <semtlenori@gmail.com>
Vincent Voyer <v@fasterize.com>
Takahiro ANDO <takahiro.ando@gmail.com>
+Erwin van der Koogh <github@koogh.com>
Brian Schroeder <bts@gmail.com>
J. Lee Coltrane <lee@projectmastermind.com>
Javier Hernández <jhernandez@emergya.com>
diff --git a/ChangeLog b/ChangeLog
index 42e81cec4b..42ee4fd31c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -514,6 +514,38 @@
* Bug fixes
+2012.07.10 Version 0.6.20 (maintenance)
+
+* npm: Upgrade to 1.1.37 (isaacs)
+
+* benchmark: Backport improvements made in master (isaacs)
+
+* build: always link with -lz (Trent Mick)
+
+* core: use proper #include directives (Ben Noordhuis)
+
+* cluster: don't silently drop messages when the write queue gets big (Bert Belder)
+
+* windows: don't print error when GetConsoleTitleW returns an empty string (Bert Belder)
+
+
+2012.06.06 Version 0.6.19 (stable), debf552ed2d4a53957446e82ff3c52a8182d5ff4
+
+* npm: upgrade to 1.1.24
+
+* fs: no end emit after createReadStream.pause() (Andreas Madsen)
+
+* vm: cleanup module memory leakage (Marcel Laverdet)
+
+* unix: fix loop starvation under high network load (Ben Noordhuis)
+
+* unix: remove abort() in ev_unref() (Ben Noordhuis)
+
+* windows/tty: never report error after forcibly aborting line-buffered read (Bert Belder)
+
+* windows: skip GetFileAttributes call when opening a file (Bert Belder)
+
+
2012.05.15 Version 0.6.18 (stable), 4bc1d395de6abed2cf1e4d0b7b3a1480a21c368f
* windows: skip GetFileAttributes call when opening a file (Bert Belder)
diff --git a/benchmark/http_simple_cluster.js b/benchmark/http_simple_cluster.js
index ecc3169adb..9a886f2ee7 100644
--- a/benchmark/http_simple_cluster.js
+++ b/benchmark/http_simple_cluster.js
@@ -3,7 +3,7 @@ var os = require('os');
if (cluster.isMaster) {
console.log('master running on pid %d', process.pid);
- for (var i = 1, n = os.cpus().length; i < n; ++i) cluster.fork();
+ for (var i = 0, n = os.cpus().length; i < n; ++i) cluster.fork();
} else {
require(__dirname + '/http_simple.js');
}
diff --git a/doc/community/index.html b/doc/community/index.html
index b5cbc73223..bb4e17baa4 100644
--- a/doc/community/index.html
+++ b/doc/community/index.html
@@ -148,6 +148,8 @@
<br>
<a href="http://nodehispano.com">Node Hispano</a> Spanish language community
<br>
+ <a href="http://www.nodejs.es">Node.js Español</a> Node.js in Spanish
+ <br>
<a href="http://nodejskr.org">OctoberSkyJs</a> Korea Node.js community
</p>