summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2013-12-19 09:03:45 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2013-12-19 09:03:45 -0800
commit696ae46fd7592d786f7c573fad9abf386209d254 (patch)
tree72e758f797f3ab5df4258feb53d81f8f0566ec6c
parent9371be0aa1548b199dd028f49e3f55ec922d4766 (diff)
parentb7fd6bc899ccb629d790c47aee06aba87e535c41 (diff)
downloadnode-696ae46fd7592d786f7c573fad9abf386209d254.tar.gz
Merge branch 'v0.10.24-release' into v0.10
-rw-r--r--ChangeLog17
-rw-r--r--src/node_version.h2
2 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92f10d0d9..8e9edb25a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-2013.12.12, Version 0.10.23 (Stable)
+2013.12.18, Version 0.10.24 (Stable)
+
+* uv: Upgrade to v0.10.21
+
+* npm: upgrade to 1.3.21
+
+* v8: backport fix for CVE-2013-{6639|6640}
+
+* build: unix install node and dep library headers (Timothy J Fontaine)
+
+* cluster, v8: fix --logfile=%p.log (Ben Noordhuis)
+
+* module: only cache package main (Wyatt Preul)
+
+
+2013.12.12, Version 0.10.23 (Stable), 0462bc23564e7e950a70ae4577a840b04db6c7c6
* uv: Upgrade to v0.10.20 (Timothy J Fontaine)
diff --git a/src/node_version.h b/src/node_version.h
index ca14c279c..70a6e4d24 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 24
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""