diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-02-06 14:04:19 -0800 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-02-06 14:04:19 -0800 |
| commit | 1de0ca8c44fe7d9aa842b64c6429d87ef00da365 (patch) | |
| tree | 6de891a14c7cf6054160d6e4d1179d874ad682fb | |
| parent | 087a7519cea9b8aed23f4c03111da724cf20a94f (diff) | |
| parent | 2b18916ff054309a07408719b62e2b6a4f1e056a (diff) | |
| download | node-new-1de0ca8c44fe7d9aa842b64c6429d87ef00da365.tar.gz | |
Merge branch 'v0.12.0-release' into v0.12
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -1,4 +1,11 @@ -2015.01.29, Version 0.11.16 (Unstable) +2015.02.06, Version 0.12.0 (Stable) + +* npm: Upgrade to 2.5.1 + +* mdb_v8: update for v0.12 (Dave Pacheco) + + +2015.01.29, Version 0.11.16 (Unstable), 8e42e5a0731040075e14cec087eea86729f2dc53 * openssl: Upgrade to 1.0.1l diff --git a/src/node_version.h b/src/node_version.h index bf3ccda753..3450714c1e 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 12 #define NODE_PATCH_VERSION 0 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |