diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-07-25 13:53:45 -0700 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-07-25 13:53:45 -0700 |
commit | e2a598b5f24973a481de7a0efc2d71ebec71fe1a (patch) | |
tree | 8e1e0cb835ca1bbd1b73d406154dccaad23ff559 | |
parent | 5c81f41e7094ba3db3df27eb443a4f8521dd48dd (diff) | |
parent | fdf57f811f9683a4ec49a74dc7226517e32e6c9d (diff) | |
download | node-e2a598b5f24973a481de7a0efc2d71ebec71fe1a.tar.gz |
Merge branch 'v0.10.14-release' into v0.10
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | ChangeLog | 23 | ||||
-rw-r--r-- | src/node_version.h | 2 |
3 files changed, 23 insertions, 3 deletions
@@ -456,3 +456,4 @@ Kiyoshi Nomo <tokyoincidents.g@gmail.com> Veres Lajos <vlajos@gmail.com> Yuan Chuan <yuanchuan23@gmail.com> Peter Rust <peter@cornerstonenw.com> +Shuan Wang <shuanwang@gmail.com> @@ -1,4 +1,23 @@ -2013.07.09, Version 0.10.13 (Stable) +2013.07.25, Version 0.10.14 (Stable) + +* uv: Upgrade to v0.10.13 + +* npm: Upgrade to v1.3.5 + +* os: Don't report negative times in cpu info (Ben Noordhuis) + +* fs: Handle large UID and GID (Ben Noordhuis) + +* url: Fix edge-case when protocol is non-lowercase (Shuan Wang) + +* doc: Streams API Doc Rewrite (isaacs) + +* node: call MakeDomainCallback in all domain cases (Trevor Norris) + +* crypto: fix memory leak in LoadPKCS12 (Fedor Indutny) + + +2013.07.09, Version 0.10.13 (Stable), e32660a984427d46af6a144983cf7b8045b7299c * uv: Upgrade to v0.10.12 @@ -23,7 +42,7 @@ * src: fix memory leak in UsingDomains() (Ben Noordhuis) -2013.06.18, Version 0.10.12 (Stable) +2013.06.18, Version 0.10.12 (Stable), a088cf4f930d3928c97d239adf950ab43e7794aa * npm: Upgrade to 1.2.32 diff --git a/src/node_version.h b/src/node_version.h index 836153b80..606caa384 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -26,7 +26,7 @@ #define NODE_MINOR_VERSION 10 #define NODE_PATCH_VERSION 14 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_TAG # define NODE_TAG "" |