Merge branch 'master' into devel

History.md

@@ -1,5 +1,10 @@
 ## vNEXT
 
+## v0.6.6.1
+
+* Fix file watching on OSX. Work around Node issue #6251 by not using
+  fs.watch. #1483
+
 ## v0.6.6
 
 #### Security

docs/lib/release-override.js

@@ -1,5 +1,5 @@
 // While galaxy apps are on their own special meteor releases, override
 // Meteor.release here.
 if (Meteor.isClient) {
-  Meteor.release = Meteor.release ? "0.6.6" : undefined;
+  Meteor.release = Meteor.release ? "0.6.6.1" : undefined;
 }

examples/leaderboard/.meteor/release

@@ -1 +1 @@
-0.6.6
+0.6.6.1

examples/parties/.meteor/release

@@ -1 +1 @@
-0.6.6
+0.6.6.1

examples/todos/.meteor/release

@@ -1 +1 @@
-0.6.6
+0.6.6.1

examples/wordplay/.meteor/release

@@ -1 +1 @@
-0.6.6
+0.6.6.1

scripts/admin/banner.txt

@@ -1,6 +1,4 @@
-=> Meteor 0.6.6: Mongo upsert and $near queries, new browser-policy
-   package for security headers, NodeJS 0.10, and much more. For
-   details, see: https://github.com/meteor/meteor/blob/devel/History.md
+=> Meteor 0.6.6.1: Fix file watching on OSX (work around Node issue #6251)
 
    This is being downloaded in the background. Update your project
-   to Meteor 0.6.6 by running 'meteor update'.
+   to Meteor 0.6.6.1 by running 'meteor update'.

scripts/admin/notices.json

@@ -57,6 +57,9 @@
   {
     "release": "0.6.6"
   },
+  {
+    "release": "0.6.6.1"
+  },
   {
     "release": "NEXT"
   }