From 58002d56bc79410c5ff397fc0e1ffec0665db38a Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Wed, 13 Apr 2011 21:20:05 -0700
Subject: [PATCH] Bump to v0.4.6

---
 AUTHORS            |  3 +++
 ChangeLog          | 30 ++++++++++++++++++++++++++++++
 doc/index.html     |  8 ++++----
 src/node_version.h |  2 +-
 wscript            |  2 +-
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7159091579f665..cf29f0189e4c3b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -167,4 +167,7 @@ Dean McNamee <dean@gmail.com>
 Trevor Burnham <trevor@databraid.com>
 Zachary Scott <zachary.s.scott@gmail.com>
 Arnout Kazemier <info@3rd-Eden.com>
+George Stagas <gstagas@gmail.com>
+Scott McWhirter <scott.mcwhirter@joyent.com>
+Jakub Lekstan <jakub.lekstan@dreamlab.pl>
 
diff --git a/ChangeLog b/ChangeLog
index e4a09248bbc019..bba5127ea3c4c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2011.04.13, Version 0.4.6 (stable)
+
+* Don't error on ENOTCONN from shutdown() #670
+
+* Auto completion of built-in debugger suggests prefix match rather than
+	partial match. (koichik)
+
+* circular reference in vm modules. #822 (Jakub Lekstan)
+
+* http response.readable should be false after 'end' #867 (Abe Fettig)
+
+* Implemenet os.cpus() and os.uptime() on Solaris (Scott McWhirter)
+
+* fs.ReadStream: Allow omission of end option for range reads #801
+	(Felix Geisendörfer)
+
+* Buffer.write() with UCS-2 should not be write partial char
+	#916 (koichik)
+
+* Pass secureProtocol through on tls.Server creation (Theo Schlossnagle)
+
+* TLS use RC4-SHA by default
+
+* Don't strangely drop out of event loop on HTTPS client uploads #892
+
+* Doc improvements
+
+* Upgrade v8 to 3.1.8.10
+
+
 2011.04.01, Version 0.4.5 (stable)
 
 * Fix listener leak in stream.pipe() (Mikeal Rogers)
diff --git a/doc/index.html b/doc/index.html
index 7f4db3f96bcf5a..3406f83cf2f929 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -26,7 +26,7 @@
         <li><a href="#download">Download</a></li>
         <li><a href="https://github.com/joyent/node/raw/master/ChangeLog">ChangeLog</a></li>
         <li><a href="#about">About</a></li>
-        <li><a href="http://nodejs.org/docs/v0.4.5/api">v0.4.5 docs</a></li>
+        <li><a href="http://nodejs.org/docs/v0.4.6/api">v0.4.6 docs</a></li>
         <br/>
         <li><B><a href="https://github.com/joyent/node/wiki">Wiki</a></B></li>
         <li><B><a href="http://blog.nodejs.org/">Blog</a></B></li>
@@ -108,9 +108,9 @@ <h2 id="download">Download</h2>
       </p>
 
       <p>
-        2011.04.01
-        <a href="http://nodejs.org/dist/node-v0.4.5.tar.gz">node-v0.4.5.tar.gz</a>
-        (<a href="http://nodejs.org/docs/v0.4.5/api/index.html">Documentation</a>)
+        2011.04.13
+        <a href="http://nodejs.org/dist/node-v0.4.6.tar.gz">node-v0.4.6.tar.gz</a>
+        (<a href="http://nodejs.org/docs/v0.4.6/api/index.html">Documentation</a>)
       </p>
 
       <p>Historical: <a href="http://nodejs.org/dist">versions</a>, <a href="http://nodejs.org/docs">docs</a></p>
diff --git a/src/node_version.h b/src/node_version.h
index eef324505f2cc4..caef271c942c03 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -28,7 +28,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 4
 #define NODE_PATCH_VERSION 6
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)
diff --git a/wscript b/wscript
index 756b530cf8c0fb..f8357c470db040 100644
--- a/wscript
+++ b/wscript
@@ -872,7 +872,7 @@ def build(bld):
         , 'CPPFLAGS'  : " ".join(program.env["CPPFLAGS"]).replace('"', '\\"')
         , 'LIBFLAGS'  : " ".join(program.env["LIBFLAGS"]).replace('"', '\\"')
         , 'PREFIX'    : safe_path(program.env["PREFIX"])
-        , 'VERSION'   : '0.4.5' # FIXME should not be hard-coded, see NODE_VERSION_STRING in src/node_version.
+        , 'VERSION'   : '0.4.6' # FIXME should not be hard-coded, see NODE_VERSION_STRING in src/node_version.
         }
     return x