Merge branch 'v0.10.7-release' into v0.10

12 years ago · cc7ec075e9
3 changed files with 17 additions and 2 deletions
--- a/2
+++ b/2
@ -447,3 +447,5 @@ Kevin Locke <kevin@kevinlocke.name>
 Daniel Moore <polaris@northhorizon.net>
 Robert Kowalski <rok@kowalski.gd>
 Benoit Vallée <github@benoitvallee.net>
+Ryuichi Okumura <okuryu@okuryu.com>
+Brandon Frohs <bfrohs@gmail.com>
--- a/15
+++ b/15
@ -1,4 +1,17 @@
-2013.05.14, Version 0.10.6 (Stable)
+2013.05.17, Version 0.10.7 (Stable)
+
+* uv: upgrade to v0.10.7
+
+* npm: Upgrade to 1.2.21
+
+* crypto: Don't ignore verify encoding argument (isaacs)
+
+* buffer, crypto: fix default encoding regression (Ben Noordhuis)
+
+* timers: fix setInterval() assert (Ben Noordhuis)
+
+
+2013.05.14, Version 0.10.6 (Stable), 5deb1672f2b5794f8be19498a425ea4dc0b0711f

 * module: Deprecate require.extensions (isaacs)

--- a/src/node_version.h
+++ b/src/node_version.h
@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 7

-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1

 #ifndef NODE_TAG
 # define NODE_TAG ""