summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2013-01-18 12:51:14 -0800
committerisaacs <i@izs.me>2013-01-18 12:51:14 -0800
commitf05cf3bea738188b30bb36a48d7cd6eaedfe1e02 (patch)
tree37b0fd90356b73a195a8693897f39f650ac3b2cc
parent4d32fc59642bc22b9bb8bf5d4df8ebb07698ddc3 (diff)
parent2c4eef0d972838c51999d32c0d251857a713dc18 (diff)
downloadnode-f05cf3bea738188b30bb36a48d7cd6eaedfe1e02.tar.gz
Merge branch 'v0.8.18-release' into v0.8
-rw-r--r--AUTHORS2
-rw-r--r--ChangeLog17
-rw-r--r--src/node_version.h2
3 files changed, 19 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 35b630510..d83da9631 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -375,3 +375,5 @@ Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
Nicolas Chambrier <naholyr@gmail.com>
Tim Bradshaw <tfb@cley.com>
Johannes Ewald <mail@johannesewald.de>
+Chris Dent <chris.dent@gmail.com>
+Dan Milon <danmilon@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 9865581a4..d9c443d32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-2013.01.09, Version 0.8.17 (Stable)
+2013.01.18, Version 0.8.18 (Stable)
+
+* npm: Upgrade to v1.2.2
+
+* dns: make error message match errno (Dan Milon)
+
+* tls: follow RFC6125 more stricly (Fedor Indutny)
+
+* buffer: reject negative SlowBuffer offsets (Ben Noordhuis)
+
+* install: add simplejson fallback (Chris Dent)
+
+* http: fix "Cannot call method 'emit' of null" (Ben Noordhuis)
+
+
+2013.01.09, Version 0.8.17 (Stable), c50c33e9397d7a0a8717e8ce7530572907c054ad
* npm: Upgrade to v1.2.0
- peerDependencies (Domenic Denicola)
diff --git a/src/node_version.h b/src/node_version.h
index 43d705d0c..8ef978923 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -30,7 +30,7 @@
# define NODE_TAG ""
#endif
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)