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

Julien Gilli · Julien Gilli · commit 54d808d2ea12 · 2015-01-30T09:05:18.000-08:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+2015.01.29, Version 0.11.16 (Unstable)
+
+* openssl: Upgrade to 1.0.1l
+
+* npm: Upgrade to 2.3.0
+
+* url: revert support of `path` for url.format" (Julien Gilli)
+
+* assert: use util.inspect() to create error messages (cjihrig)
+
+* net: throw on invalid socket timeouts (cjihrig)
+
+* url: fix parsing of ssh urls (Evan Lucas)
+
+
 2015.01.20, Version 0.11.15 (Unstable), 8a9f263a82089814e69f277f9fecd2888705101b
 
 * v8: Upgrade to 3.28.73
diff --git a/src/node_version.h b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 11
 #define NODE_PATCH_VERSION 16
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""
