From f4e21c0d375acc7fb7294c29a394f0968eefb3de Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Sun, 20 Oct 2013 22:02:25 -0700
Subject: [PATCH] Bump node version from 0.10.20 to 0.10.21 for Meteor 0.6.6.2
 release.

---
 History.md                     | 6 ++++++
 docs/client/concepts.html      | 2 +-
 meteor                         | 2 +-
 scripts/generate-dev-bundle.sh | 2 +-
 tools/bundler.js               | 2 +-
 tools/meteor.js                | 2 +-
 tools/server/boot.js           | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/History.md b/History.md
index 6db60365d5..d0fd8a7b0c 100644
--- a/History.md
+++ b/History.md
@@ -1,10 +1,16 @@
 ## vNEXT
 
+## v0.6.6.2
+
+* Upgrade Node from 0.10.20 to 0.10.21 (security update).
+
+
 ## v0.6.6.1
 
 * Fix file watching on OSX. Work around Node issue #6251 by not using
   fs.watch. #1483
 
+
 ## v0.6.6
 
 #### Security
diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 375bf90e9c..57dec594cd 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -826,7 +826,7 @@ To get started, run
 This command will generate a fully-contained Node.js application in the form of
 a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.10.20.) You can then run the application by invoking node, specifying the HTTP
+0.10.21.) You can then run the application by invoking node, specifying the HTTP
 port for the application to listen on, and the MongoDB endpoint.  If you don't
 already have a MongoDB server, we can recommend our friends at
 [MongoHQ](http://mongohq.com).
diff --git a/meteor b/meteor
index 8efdb709e8..71057687c1 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.19
+BUNDLE_VERSION=0.3.23
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 85b33fdff3..f5134c447b 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -76,7 +76,7 @@ cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
 # the top of tools/meteor.js and tools/server/boot.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.10.20
+git checkout v0.10.21
 
 ./configure --prefix="$DIR"
 make -j4
diff --git a/tools/bundler.js b/tools/bundler.js
index 30b0459d5b..557c52fb6c 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1443,7 +1443,7 @@ var writeSiteArchive = function (targets, outputPath, options) {
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one dependency:\n" +
 "Node.js 0.10 (with the 'fibers' package). The current release of Meteor\n" +
-"has been tested with Node 0.10.20. To run the application:\n" +
+"has been tested with Node 0.10.21. To run the application:\n" +
 "\n" +
 "  $ npm install fibers@1.0.1\n" +
 "  $ export MONGO_URL='mongodb://user:password@host:port/databasename'\n" +
diff --git a/tools/meteor.js b/tools/meteor.js
index 7b24fb4167..917221934a 100644
--- a/tools/meteor.js
+++ b/tools/meteor.js
@@ -24,7 +24,7 @@ Fiber(function () {
 
   var Future = require('fibers/future');
   // This code is duplicated in app/server/server.js.
-  var MIN_NODE_VERSION = 'v0.10.20';
+  var MIN_NODE_VERSION = 'v0.10.21';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
diff --git a/tools/server/boot.js b/tools/server/boot.js
index 32859e084b..23f977146e 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -6,7 +6,7 @@ var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
 // This code is duplicated in tools/server/server.js.
-var MIN_NODE_VERSION = 'v0.10.20';
+var MIN_NODE_VERSION = 'v0.10.21';
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(
     'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');