Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
Merge branch 'v0.6' into v0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
piscisaureus committed Jul 12, 2012
2 parents 1d99441 + b6e916d commit d2e40f6
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -325,6 +325,7 @@ Garen Torikian <gjtorikian@gmail.com>
EungJun Yi <semtlenori@gmail.com> EungJun Yi <semtlenori@gmail.com>
Vincent Voyer <v@fasterize.com> Vincent Voyer <v@fasterize.com>
Takahiro ANDO <takahiro.ando@gmail.com> Takahiro ANDO <takahiro.ando@gmail.com>
Erwin van der Koogh <github@koogh.com>
Brian Schroeder <bts@gmail.com> Brian Schroeder <bts@gmail.com>
J. Lee Coltrane <lee@projectmastermind.com> J. Lee Coltrane <lee@projectmastermind.com>
Javier Hernández <jhernandez@emergya.com> Javier Hernández <jhernandez@emergya.com>
Expand Down
32 changes: 32 additions & 0 deletions ChangeLog
Expand Up @@ -514,6 +514,38 @@
* Bug fixes * 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 2012.05.15 Version 0.6.18 (stable), 4bc1d395de6abed2cf1e4d0b7b3a1480a21c368f


* windows: skip GetFileAttributes call when opening a file (Bert Belder) * windows: skip GetFileAttributes call when opening a file (Bert Belder)
Expand Down
2 changes: 1 addition & 1 deletion benchmark/http_simple_cluster.js
Expand Up @@ -3,7 +3,7 @@ var os = require('os');


if (cluster.isMaster) { if (cluster.isMaster) {
console.log('master running on pid %d', process.pid); 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 { } else {
require(__dirname + '/http_simple.js'); require(__dirname + '/http_simple.js');
} }
2 changes: 2 additions & 0 deletions doc/community/index.html
Expand Up @@ -148,6 +148,8 @@ <h2 class="localized">Localized Sites</h2>
<br> <br>
<a href="http://nodehispano.com">Node Hispano</a> Spanish language community <a href="http://nodehispano.com">Node Hispano</a> Spanish language community
<br> <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 <a href="http://nodejskr.org">OctoberSkyJs</a> Korea Node.js community
</p> </p>


Expand Down

0 comments on commit d2e40f6

Please sign in to comment.