Merge branch 'master' into devel

Conflicts:
	History.md

History.md

@@ -1,4 +1,4 @@
-## v0.6.7
+## v0.7.0
 
 This version of Meteor contains a patch for a bug in Node 0.10 which
 most commonly affects websockets. The patch is against Node version
@@ -16,13 +16,14 @@ apply the patch and will instead disable websockets.
   with `meteor run`, and can be enabled in production with the
   `MONGO_OPLOG_URL` environment variable. Currently the only supported
   selectors are equality checks; `$`-operators, `limit` and `skip`
-  queries fall back to the original poll-and-diff algorithm. See <XXX
-  wiki page> for details.
+  queries fall back to the original poll-and-diff algorithm. See
+  https://github.com/meteor/meteor/wiki/Oplog-Observe-Driver
+  for details.
 
 * Add `Meteor.onConnection` and add `this.connection` to method
   invocations and publish functions. These can be used to store data
   associated with individual clients between subscriptions and method
-  calls. See http://docs.meteor.com/#meteor_onconnection for details.
+  calls. See http://docs.meteor.com/#meteor_onconnection for details. #1611
 
 * Rework hot code push. The new `autoupdate` package drives automatic
   reloads on update using standard DDP messages instead of a hardcoded
@@ -30,9 +31,7 @@ apply the patch and will instead disable websockets.
   client code changes; server-only code changes will not cause the page
   to reload.
 
-* New 'facts' package publishes internal statistics about Meteor. To
-  use, simply `meteor add facts` then add `{{> serverFacts}}` somewhere
-  in your interface.
+* New `facts` package publishes internal statistics about Meteor.
 
 * Add an explicit check that publish functions return a cursor, an array
   of cursors, or a falsey value. This is a safety check to to prevent
@@ -42,24 +41,27 @@ apply the patch and will instead disable websockets.
 * Implement `$each`, `$sort`, and `$slice` options for minimongo's `$push`
   modifier.  #1492
 
-* Introduce '--raw-logs' option to `meteor run` to disable log
+* Introduce `--raw-logs` option to `meteor run` to disable log
   coloring and timestamps.
 
 * Add `WebAppInternals.setBundledJsCssPrefix()` to control where the
   client loads bundled JavaScript and CSS files. This allows serving
   files from a CDN to decrease page load times and reduce server load.
 
-* Attempt to exit cleanly on 'SIGHUP'. Stop accepting incoming
+* Attempt to exit cleanly on `SIGHUP`. Stop accepting incoming
   connections, kill DDP connections, and finish all outstanding requests
   for static assets.
 
+* In the HTTP server, only keep sockets with no active HTTP requests alive for 5
+  seconds.
+
 * Fix handling of `fields` option in minimongo when only `_id` is present. #1651
 
 * Fix issue where setting `process.env.MAIL_URL` in app code would not
-  alter where mail was sent. This was a regression from 0.6.6. #1649
+  alter where mail was sent. This was a regression in 0.6.6 from 0.6.5. #1649
 
-* Prompt for passwords on stderr instead of stdout for easier automation
-  in shell scripts. #1600
+* Use stderr instead of stdout (for easier automation in shell scripts) when
+  prompting for passwords and when downloading the dev bundle. #1600
 
 * Bundler failures cause non-zero exit code in `meteor run`.  #1515
 
@@ -96,9 +98,10 @@ apply the patch and will instead disable websockets.
   * MongoDB from 2.4.6 to 2.4.8
   * clean-css from 1.1.2 to 2.0.2
   * uglify-js from a fork of 2.4.0 to 2.4.7
+  * handlebars npm module no longer available outside of handlebars package
 
-Patches contributed by GitHub users AlexeyMK, awwx, dandv,
-DenisGorbachev, FooBarWidget, mitar, mcbain, rzymek, and sdarnell.
+Patches contributed by GitHub users AlexeyMK, awwx, dandv, DenisGorbachev,
+emgee3, FooBarWidget, mitar, mcbain, rzymek, and sdarnell.
 
 
 ## v0.6.6.3

LICENSE.txt

@@ -217,6 +217,7 @@ Copyright (c) 2011 Esa-Matti Suuronen esa-matti@suuronen.org
 ----------
 node-gyp: https://github.com/TooTallNate/node-gyp
 keypress: https://github.com/TooTallNate/keypress
+bindings: https://github.com/TooTallNate/node-bindings
 ----------
 
 Copyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>
@@ -542,6 +543,14 @@ geojson-utils: https://github.com/maxogden/geojson-js-utils
 
 Copyright (c) 2010 Max Ogden
 
+
+----------
+bcrypt: https://github.com/ncb000gt/node.bcrypt.js
+----------
+
+Copyright (c) 2010 Nicholas Campbell
+
+
 ==============
 Apache License
 ==============
@@ -641,11 +650,10 @@ BSD Licenses
 ============
 
 ----------
-uglify-js: https://github.com/mishoo/UglifyJS
+uglify-js: https://github.com/mishoo/UglifyJS2
 ----------
 
-Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
-Based on parse-js (http://marijn.haverbeke.nl/parse-js/).
+Copyright 2012-2013 (c) Mihai Bazon <mihai.bazon@gmail.com>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -1263,6 +1271,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------
 npm-user-validate: https://github.com/robertkowalski/npm-user-validate
+github-url-from-username-repo: https://github.com/robertkowalski/github-url-from-username-repo
 ----------
 
 Copyright (c) Robert Kowalski
@@ -1738,7 +1747,9 @@ The externally maintained libraries used by libuv are:
 
 ----------
 nodejs: http://nodejs.org/
-readable-stream: https://github.com/isaacs/readable-stream/
+readable-stream: https://github.com/isaacs/readable-stream
+npm: https://github.com/isaacs/npm
+init-package-json: https://github.com/isaacs/init-package-json
 ----------
 
 

docs/.meteor/release

@@ -1 +1 @@
-galaxy-follower-6
+0.7.0

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.3" : undefined;
+  Meteor.release = Meteor.release ? "0.7.0" : undefined;
 }

examples/leaderboard/.meteor/release

@@ -1 +1 @@
-0.6.6.2
+0.7.0

examples/parties/.meteor/release

@@ -1 +1 @@
-0.6.6.2
+0.7.0

examples/todos/.meteor/release

@@ -1 +1 @@
-0.6.6.2
+0.7.0

examples/wordplay/.meteor/release

@@ -1 +1 @@
-0.6.6.2
+0.7.0

packages/facts/package.js

@@ -1,5 +1,6 @@
 Package.describe({
-  summary: "Publish internal app statistics"
+  summary: "Publish internal app statistics",
+  internal: true
 });
 
 Package.on_use(function (api) {

packages/livedata/stream_server.js

@@ -74,7 +74,7 @@ StreamServer = function () {
 
     // XXX COMPAT WITH 0.6.6. Send the old style welcome message, which
     // will force old clients to reload. Remove this once we're not
-    // concerned about people upgrading from a pre-0.6.7 release. Also,
+    // concerned about people upgrading from a pre-0.7.0 release. Also,
     // remove the clause in the client that ignores the welcome message
     // (livedata_connection.js)
     socket.send(JSON.stringify({server_id: "0"}));

scripts/admin/banner.txt

@@ -1,5 +1,5 @@
-=> Meteor 0.6.6.3: Fix CPU runaway while watching files in large
-   projects and occasional server crash on session disconnect.
+=> Meteor 0.7.0: use MongoDB's operations log to observe equality
+   queries instead of polling the database server on each update.
 
    This release is being downloaded in the background. Update your
-   project to Meteor 0.6.6.3 by running 'meteor update'.
+   project to Meteor 0.7.0 by running 'meteor update'.

scripts/admin/notices.json

@@ -72,6 +72,9 @@
   {
     "release": "0.6.6.3"
   },
+  {
+    "release": "0.7.0"
+  },
   {
     "release": "NEXT"
   }