summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2014-02-18 14:55:58 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2014-02-18 14:55:58 -0800
commit31c510ca8829ef6e6727e530a57d75b4233b275a (patch)
treee0cb410d84ece50f7d7710058e152376f23ac06a
parent1fa5cff4f21782fb1ba499c38e690a13d70ba765 (diff)
downloadnode-31c510ca8829ef6e6727e530a57d75b4233b275a.tar.gz
2014.02.18, Version 0.10.26 (Stable)
* uv: Upgrade to v0.10.25 (Timothy J Fontaine) * npm: upgrade to 1.4.3 (isaacs) * v8: support compiling with VS2013 (Fedor Indutny) * cares: backport TXT parsing fix (Fedor Indutny) * crypto: throw on SignFinal failure (Fedor Indutny) * crypto: update root certificates (Ben Noordhuis) * debugger: Fix breakpoint not showing after restart (Farid Neshat) * fs: make unwatchFile() insensitive to path (iamdoron) * net: do not re-emit stream errors (Fedor Indutny) * net: make Socket destroy() re-entrance safe (Jun Ma) * net: reset `endEmitted` on reconnect (Fedor Indutny) * node: do not close stdio implicitly (Fedor Indutny) * zlib: avoid assertion in close (Fedor Indutny)
-rw-r--r--AUTHORS8
-rw-r--r--ChangeLog31
-rw-r--r--src/node_version.h2
3 files changed, 39 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 28cbb58f7..fe9955784 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -485,3 +485,11 @@ ayanamist <contact@ayanamist.com>
Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Brandon Cheng <bcheng.gt@gmail.com>
Alexis Campailla <alexis@janeasystems.com>
+Jun Ma <roammm@gmail.com>
+Maxime Quandalle <maxime.quandalle@gmail.com>
+Benjamin Waters <ben25890@gmail.com>
+Doron Pagot <doronpagot@gmail.com>
+Kenan Sulayman <kenan@sly.mn>
+Christian Schulz <me@rndm.de>
+Pedro Ballesteros <nitroduna@gmail.com>
+Anton Khlynovskiy <subzey@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 51fe08376..8538c7f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,33 @@
-2014.01.23, Version 0.10.25 (Stable)
+2014.02.18, Version 0.10.26 (Stable)
+
+* uv: Upgrade to v0.10.25 (Timothy J Fontaine)
+
+* npm: upgrade to 1.4.3 (isaacs)
+
+* v8: support compiling with VS2013 (Fedor Indutny)
+
+* cares: backport TXT parsing fix (Fedor Indutny)
+
+* crypto: throw on SignFinal failure (Fedor Indutny)
+
+* crypto: update root certificates (Ben Noordhuis)
+
+* debugger: Fix breakpoint not showing after restart (Farid Neshat)
+
+* fs: make unwatchFile() insensitive to path (iamdoron)
+
+* net: do not re-emit stream errors (Fedor Indutny)
+
+* net: make Socket destroy() re-entrance safe (Jun Ma)
+
+* net: reset `endEmitted` on reconnect (Fedor Indutny)
+
+* node: do not close stdio implicitly (Fedor Indutny)
+
+* zlib: avoid assertion in close (Fedor Indutny)
+
+
+2014.01.23, Version 0.10.25 (Stable), b0e5f195dfce3e2b99f5091373d49f6616682596
* uv: Upgrade to v0.10.23
diff --git a/src/node_version.h b/src/node_version.h
index 74aa502be..4e89a3788 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
#define NODE_MINOR_VERSION 10
#define NODE_PATCH_VERSION 26
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_TAG
# define NODE_TAG ""