summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Gilli <julien.gilli@joyent.com>2015-03-23 18:10:54 -0700
committerJulien Gilli <julien.gilli@joyent.com>2015-03-23 18:12:47 -0700
commit0034086b49f22cfde765a7e9f55db25f8eb310b6 (patch)
tree55a161cee3d77f622df203ccf4681279c7f8dbf5
parenta43219bcd12552ac854164655ebe0c35607fbc2a (diff)
downloadnode-new-0034086b49f22cfde765a7e9f55db25f8eb310b6.tar.gz
2015.03.23, Version 0.12.1 (Stable)v0.12.1v0.12.1-release
* openssl: upgrade to 1.0.1m (Addressing multiple CVES)
-rw-r--r--ChangeLog7
-rw-r--r--src/node_version.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 33eb8dbe7b..f5179a5255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2015.02.06, Version 0.12.0 (Stable)
+2015.03.23, Version 0.12.1 (Stable)
+
+* openssl: upgrade to 1.0.1m (Addressing multiple CVES)
+
+
+2015.02.06, Version 0.12.0 (Stable), 2b18916ff054309a07408719b62e2b6a4f1e056a
* npm: Upgrade to 2.5.1
diff --git a/src/node_version.h b/src/node_version.h
index cc9c08f6d3..2c2afda62a 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 12
#define NODE_PATCH_VERSION 1
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""