From e513ffef7549a56a5af728e1f0c2c0c8f290518a Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Thu, 22 Mar 2012 17:32:11 -0700
Subject: [PATCH] 2012.03.22 Version 0.6.14 (stable)

* net: don't crash when queued write fails (Igor Zinkovsky)

* sunos: fix EMFILE on process.memoryUsage() (Bryan Cantrill)

* crypto: fix compile-time error with openssl 0.9.7e (Ben Noordhuis)

* unix: ignore ECONNABORTED errors from accept() (Ben Noordhuis)

* Add UV_ENOSPC and mappings to it (Bert Belder)

* http-parser: Fix response body is not read (koichik)

* Upgrade npm to 1.1.12
  - upgrade node-gyp to 0.3.7
  - work around AV-locked directories on Windows
  - Fix isaacs/npm#2293 Don't try to 'uninstall' /
  - Exclude symbolic links from packages.
  - Fix isaacs/npm#2275 Spurious 'unresolvable cycle' error.
  - Exclude/include dot files as if they were normal files
---
 AUTHORS            |  5 +++++
 ChangeLog          | 25 ++++++++++++++++++++++++-
 src/node_version.h |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 93ea8a93620ded..eecc2add1e703c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -267,3 +267,8 @@ Philip Tellis <philip.tellis@gmail.com>
 Christopher Jeffrey <chjjeffrey@gmail.com>
 Seth Fitzsimmons <seth@mojodna.net>
 Einar Otto Stangvik <einaros@gmail.com>
+Paul Vorbach <paul@vorb.de>
+tedsuo <ted@radicaldesigns.org>
+Joshua Holbrook <josh.holbrook@gmail.com>
+Rod Vagg <rod@vagg.org>
+Bryan Cantrill <bryan@joyent.com>
diff --git a/ChangeLog b/ChangeLog
index e831c3fc6df793..ef7d3fccbfb74a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,27 @@
-2012.03.15 Version 0.6.13 (stable)
+2012.03.22 Version 0.6.14 (stable)
+
+* net: don't crash when queued write fails (Igor Zinkovsky)
+
+* sunos: fix EMFILE on process.memoryUsage() (Bryan Cantrill)
+
+* crypto: fix compile-time error with openssl 0.9.7e (Ben Noordhuis)
+
+* unix: ignore ECONNABORTED errors from accept() (Ben Noordhuis)
+
+* Add UV_ENOSPC and mappings to it (Bert Belder)
+
+* http-parser: Fix response body is not read (koichik)
+
+* Upgrade npm to 1.1.12
+  - upgrade node-gyp to 0.3.7
+  - work around AV-locked directories on Windows
+  - Fix isaacs/npm#2293 Don't try to 'uninstall' /
+  - Exclude symbolic links from packages.
+  - Fix isaacs/npm#2275 Spurious 'unresolvable cycle' error.
+  - Exclude/include dot files as if they were normal files
+
+
+2012.03.15 Version 0.6.13 (stable), 9f7f86b534f8556290eb8cad915984ff4ca54996
 
 * Windows: Many libuv test fixes (Bert Belder)
 
diff --git a/src/node_version.h b/src/node_version.h
index 3445e34de43991..d1d45361a1d1e2 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -29,7 +29,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 6
 #define NODE_PATCH_VERSION 14
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)