This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge branch 'v0.6.21-release' into v0.6

  • Loading branch information...
isaacs committed Aug 3, 2012
2 parents 974ee7b + 55ddf54 commit 30cfe2780debdab6dbfbd703ff2f54130dbe3c58
Showing with 9 additions and 2 deletions.
  1. +8 −1 ChangeLog
  2. +1 −1 src/node_version.h
View
@@ -1,4 +1,11 @@
-2012.07.10 Version 0.6.20 (maintenance)
+2012.08.03 Version 0.6.21 (maintenance)
+
+* sunos: work around OS bug to prevent fs.watch() from spinning (Bryan Cantrill)
+
+* net: make pause/resume work with connecting sockets (Bert Belder)
+
+
+2012.07.10 Version 0.6.20 (maintenance), 952e513379169ec1b40909d1db056e9bf4294899
* npm: Upgrade to 1.1.37 (isaacs)
View
@@ -29,7 +29,7 @@
#define NODE_MAJOR_VERSION 0
#define NODE_MINOR_VERSION 6
#define NODE_PATCH_VERSION 21
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

0 comments on commit 30cfe27

Please sign in to comment.