summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2013-12-11 22:11:06 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2013-12-11 22:11:06 -0800
commit593672c33dd40760e5a5f3d089ee4fd45553edba (patch)
treea8c59daf3ecbad99e9bcf29f84346be6de8ae216
parent4bc2ec90d72df1909d24c9fa52574fa90688d8da (diff)
parent0462bc23564e7e950a70ae4577a840b04db6c7c6 (diff)
downloadnode-593672c33dd40760e5a5f3d089ee4fd45553edba.tar.gz
Merge branch 'v0.10.23-release' into v0.10
-rw-r--r--AUTHORS9
-rw-r--r--ChangeLog35
-rw-r--r--src/node_version.h2
3 files changed, 44 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 5eaf29dfd..f7afc7d67 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -470,3 +470,12 @@ Eric Schrock <Eric.Schrock@delphix.com>
Zarko Stankovic <stankovic.zarko@gmail.com>
Maxim Bogushevich <boga1@mail.ru>
Phillip Alexander <git@phillipalexander.io>
+Tim Wood <washwithcare@gmail.com>
+Linus Unnebäck <linus@folkdatorn.se>
+Nikolai Vavilov <vvnicholas@gmail.com>
+Michael Ridgway <mcridgway@gmail.com>
+Yazhong Liu <yorkiefixer@gmail.com>
+Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
+Kai Groner <kai@gronr.com>
+Gabriel Farrell <g@grrawr.com>
+Nicolas Kaiser <nikai@nikai.net>
diff --git a/ChangeLog b/ChangeLog
index f021cee68..92f10d0d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,37 @@
-2013.11.12, Version 0.10.22 (Stable)
+2013.12.12, Version 0.10.23 (Stable)
+
+* uv: Upgrade to v0.10.20 (Timothy J Fontaine)
+
+* npm: Upgrade to 1.3.17 (isaacs)
+
+* gyp: update to 78b26f7 (Timothy J Fontaine)
+
+* build: include postmortem symbols on linux (Timothy J Fontaine)
+
+* crypto: Make Decipher._flush() emit errors. (Kai Groner)
+
+* dgram: fix abort when getting `fd` of closed dgram (Fedor Indutny)
+
+* events: do not accept NaN in setMaxListeners (Fedor Indutny)
+
+* events: avoid calling `once` functions twice (Tim Wood)
+
+* events: fix TypeError in removeAllListeners (Jeremy Martin)
+
+* fs: report correct path when EEXIST (Fedor Indutny)
+
+* process: enforce allowed signals for kill (Sam Roberts)
+
+* tls: emit 'end' on .receivedShutdown (Fedor Indutny)
+
+* tls: fix potential data corruption (Fedor Indutny)
+
+* tls: handle `ssl.start()` errors appropriately (Fedor Indutny)
+
+* tls: reset NPN callbacks after SNI (Fedor Indutny)
+
+
+2013.11.12, Version 0.10.22 (Stable), cbff8f091c22fb1df6b238c7a1b9145db950fa65
* npm: Upgrade to 1.3.14
diff --git a/src/node_version.h b/src/node_version.h
index bbb272672..47706201c 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 23
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""