Merge branch 'v0.12.7-release' into v0.12

nodejs · Jul 9, 2015 · bd68784 · bd68784
2 parents 9c5e9fc + d3492aa
commit bd68784
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,15 @@
-2015.07.03, Version 0.12.6 (Stable)
+2015.07.09, Version 0.12.7 (Stable)
+
+* openssl: upgrade to 1.0.1p
+
+* npm: upgrade to 2.11.3
+
+* V8: cherry-pick JitCodeEvent patch from upstream (Ben Noordhuis)
+
+* win,msi: create npm folder in AppData directory (Steven Rockarts)
+
+
+2015.07.03, Version 0.12.6 (Stable), 0be9a77bb18ec15b4fb6a1fb0762f313b7351201
 
 * V8: fix out-of-band write in utf8 decoder
 

diff --git a/src/node_version.h b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 12
 #define NODE_PATCH_VERSION 7
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""