summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS6
-rw-r--r--ChangeLog21
-rw-r--r--src/node_version.h2
3 files changed, 27 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index f7afc7d67d..28cbb58f75 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -479,3 +479,9 @@ Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
Kai Groner <kai@gronr.com>
Gabriel Farrell <g@grrawr.com>
Nicolas Kaiser <nikai@nikai.net>
+Lev Gimelfarb <lev.gimelfarb@gmail.com>
+Dav Glass <davglass@gmail.com>
+ayanamist <contact@ayanamist.com>
+Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
+Brandon Cheng <bcheng.gt@gmail.com>
+Alexis Campailla <alexis@janeasystems.com>
diff --git a/ChangeLog b/ChangeLog
index 8e9edb25a7..51fe083764 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
-2013.12.18, Version 0.10.24 (Stable)
+2014.01.23, Version 0.10.25 (Stable)
+
+* uv: Upgrade to v0.10.23
+
+* npm: Upgrade to v1.3.24
+
+* v8: Fix enumeration for objects with lots of properties
+
+* child_process: fix spawn() optional arguments (Sam Roberts)
+
+* cluster: report more errors to workers (Fedor Indutny)
+
+* domains: exit() only affects active domains (Ryan Graham)
+
+* src: OnFatalError handler must abort() (Timothy J Fontaine)
+
+* stream: writes may return false but forget to emit drain (Yang Tianyang)
+
+
+2013.12.18, Version 0.10.24 (Stable), b7fd6bc899ccb629d790c47aee06aba87e535c41
* uv: Upgrade to v0.10.21
diff --git a/src/node_version.h b/src/node_version.h
index 60846968a1..941e1f7979 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 25
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""