diff options
| author | isaacs <i@izs.me> | 2012-08-03 14:41:23 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-08-03 14:41:23 -0700 |
| commit | 30cfe2780debdab6dbfbd703ff2f54130dbe3c58 (patch) | |
| tree | 3c73375eeafa401babee5867846b2e4a61e99a3f | |
| parent | 974ee7b3ec5eda30072984dfe3a3838c0def431d (diff) | |
| parent | 55ddf54adf6c3a064142ecf3eb42f105ee90da5f (diff) | |
| download | node-30cfe2780debdab6dbfbd703ff2f54130dbe3c58.tar.gz | |
Merge branch 'v0.6.21-release' into v0.6
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -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) diff --git a/src/node_version.h b/src/node_version.h index da7e6d263..e596a6090 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -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) |