Merge branch 'master' into devel

Conflicts:
	History.md
	packages/accounts-password/package.js
	packages/accounts-password/password_server.js
	packages/constraint-solver/package.js
	packages/meteor-tool/package.js
	packages/non-core/npm-bcrypt/package.js
	packages/package-version-parser/package-version-parser-tests.js
	packages/package-version-parser/package-version-parser.js
	packages/package-version-parser/package.js
	tools/selftest.js

.mailmap

@@ -14,28 +14,34 @@
 # (Note that this script always outputs GITHUB so you should manually
 # check to see if they are an MDG employee!)
 
+GITHUB: 0a- <[email protected]>
 GITHUB: adnissen <[email protected]>
 GITHUB: aldeed <[email protected]>
 GITHUB: AlexeyMK <[email protected]>
 GITHUB: andylash <[email protected]>
 GITHUB: ansman <[email protected]>
 GITHUB: anstarovoyt <[email protected]>
 GITHUB: apendua <[email protected]>
+GITHUB: awatson1978 <[email protected]>
 GITHUB: awwx <[email protected]>
 GITHUB: babenzele <[email protected]>
 GITHUB: benweissmann <[email protected]>
+GITHUB: bwhitty <[email protected]>
 GITHUB: Cangit <[email protected]>
 GITHUB: chrisbridgett <[email protected]>
+GITHUB: christianbundy <[email protected]>
 GITHUB: cmather <[email protected]>
 GITHUB: codeinthehole <[email protected]>
 GITHUB: colllin <[email protected]>
 GITHUB: cryptoquick <[email protected]>
+GITHUB: d4nyll <[email protected]>
 GITHUB: dandv <[email protected]>
+GITHUB: DanielDent <[email protected]>
 GITHUB: DanielDent <[email protected]>
 GITHUB: DanielDornhardt <[email protected]>
 GITHUB: davegonzalez <[email protected]>
-GITHUB: DenisGorbachev <[email protected]>
 GITHUB: DenisGorbachev <[email protected]>
+GITHUB: DenisGorbachev <[email protected]>
 GITHUB: ducdigital <[email protected]>
 GITHUB: duckspeaker <[email protected]>
 GITHUB: ecwyne <[email protected]>
@@ -47,9 +53,12 @@ GITHUB: FooBarWidget <[email protected]>
 GITHUB: FredericoC <[email protected]>
 GITHUB: Gaelan <[email protected]>
 GITHUB: graemian <[email protected]>
+GITHUB: gsuess <[email protected]>
+GITHUB: hwillson <[email protected]>
 GITHUB: icellan <[email protected]>
 GITHUB: ImtiazMajeed <[email protected]>
 GITHUB: jacott <[email protected]>
+GITHUB: jakozaur <[email protected]>
 GITHUB: JamesLefrere <[email protected]>
 GITHUB: jbruni <[email protected]>
 GITHUB: jfhamlin <[email protected]>
@@ -74,8 +83,9 @@ GITHUB: mquandalle <[email protected]>
 GITHUB: musically-ut <[email protected]>
 GITHUB: nathan-muir <[email protected]>
 GITHUB: Neftedollar <[email protected]>
-GITHUB: ograycode <jason@theograys.com>
+GITHUB: netanelgilad <netanelgilad@gmail.com>
 GITHUB: ogourment <[email protected]>
+GITHUB: ograycode <[email protected]>
 GITHUB: OyoKooN <[email protected]>
 GITHUB: paulswartz <[email protected]>
 GITHUB: pcjpcj2 <[email protected]>
@@ -87,6 +97,7 @@ GITHUB: prapicault <[email protected]>
 GITHUB: Primigenus <[email protected]>
 GITHUB: pscanf <[email protected]>
 GITHUB: queso <[email protected]>
+GITHUB: rbabayoff <[email protected]>
 GITHUB: rcy <[email protected]>
 GITHUB: rdickert <[email protected]>
 GITHUB: restebanez <[email protected]>
@@ -97,10 +108,12 @@ GITHUB: richguan <[email protected]>
 GITHUB: rick-golden-healthagen <[email protected]>
 GITHUB: rissem <[email protected]>
 GITHUB: RobertLowe <[email protected]>
+GITHUB: romanzolotarev <[email protected]>
 GITHUB: rosh93 <[email protected]>
 GITHUB: ryw <[email protected]>
 GITHUB: rzymek <[email protected]>
 GITHUB: sdarnell <[email protected]>
+GITHUB: Siilwyn <[email protected]>
 GITHUB: smallhelm <[email protected]>
 GITHUB: subhog <[email protected]>
 GITHUB: svda <[email protected]>
@@ -140,5 +153,7 @@ METEOR: sixolet <[email protected]>
 METEOR: Slava <[email protected]>
 METEOR: Slava <[email protected]>
 METEOR: stubailo <[email protected]>
+METEOR: stubailo <[email protected]>
 METEOR: stubailo <[email protected]>
+METEOR: stubailo <[email protected]>
 METEOR: yyx990803 <[email protected]>

History.md

@@ -46,14 +46,14 @@
   - uglify-js: 2.4.17 (from 2.4.13)
 
 
-## v1.0.4, 2015-Mar-??
+## v1.0.4, 2015-Mar-17
 
-### Mongo Driver and Livequery
+### Mongo Driver
 
-* Meteor is now tested against MongoDB 2.6 (and the bundled version used by
-  `meteor run` has been upgraded). It should still work fine with MongoDB 2.4.
-  Previous versions of Meteor mostly worked with MongoDB 2.6, with a few
-  caveats:
+* Meteor is now tested against MongoDB 2.6 by default (and the bundled version
+  used by `meteor run` has been upgraded). It should still work fine with
+  MongoDB 2.4.  Previous versions of Meteor mostly worked with MongoDB 2.6, with
+  a few caveats:
 
     - Some upsert invocations did not work with MongoDB in previous versions of
       Meteor.
@@ -66,9 +66,10 @@
   driver is slightly different in MongoDB 2.6; see
   https://github.com/meteor/meteor/wiki/Oplog-Observe-Driver for details.
 
-  (We have not tested Meteor against the recently-released MongoDB 3.0, but as
-  of this release, Meteor uses a version of the Node Mongo driver that is
-  compatible with MongoDB 3.0 and it is likely that it will work.)
+  We have also tested Meteor against the recently-released MongoDB 3.0.0.
+  While we are not shipping MongoDB 3.0 with Meteor in this release (preferring
+  to wait until its deployment is more widespread), we believe that Meteor
+  1.0.4 apps will work fine when used with MongoDB 3.0.0 servers.
 
 * Fix 0.8.1 regression where failure to connect to Mongo at startup would log a
   message but otherwise be ignored. Now it crashes the process, as it did before
@@ -153,14 +154,6 @@
   template instead of the actual user-defined template, making it difficult to
   use `Template.instance()` for local template state.
 
-* Fix/change behavior of `Template.currentData` and `Template.parentData`
-  inside event handlers. Previously, they returned the data context of the
-  enclosing template, but now they return the data context of the target
-  element.
-
-  The previous functionality can be reproduced by using
-  `Template.instance().data` instead of `Template.currentData()`.
-
 * `Template.instance()` now works inside `Template.body`.  #3631
 
 * Allow specifying attributes on `<body>` tags in templates.
@@ -196,6 +189,10 @@
 * Add a unique index to the collection that stores OAuth login configuration to
   ensure that only one configuration exists per service.  #3514
 
+* On the server, a new option
+  `Accounts.setPassword(user, password, { logout: false })` overrides the
+  default behavior of logging out all logged-in connections for the user.  #3846
+
 
 ### Webapp
 
@@ -227,12 +224,27 @@
 * Fix crashes in `meteor search --show-all` and `meteor search --maintainer`.
   \#3636
 
-* Kill PhantomJS processes after `meteor --test`.  #3205
+* Kill PhantomJS processes after `meteor --test`, and only run the app
+  once. #3205 #3793
 
 * Give a better error when Mongo fails to start up due to a full disk.  #2378
 
 * After killing existing `mongod` servers, also clear the `mongod.lock` file.
 
+* Stricter validation for package names: they cannot begin with a hyphen, end
+  with a dot, contain two consecutive dots, or start or end with a colon.  (No
+  packages on Atmosphere fail this validation.)  Additionally, `meteor create
+  --package` applies the same validation as `meteor publish` and disallows
+  packages with multiple colons.  (Packages with multiple colons like
+  `local-test:iron:router` are used internally by `meteor test-packages` so that
+  is not a strict validation rule.)
+
+* `meteor create --package` now no longer creates a directory with the full
+  name of the package, since Windows file systems cannot have colon characters
+  in file paths. Instead, the command now creates a directory named the same
+  as the second part of the package name after the colon (without the username
+  prefix).
+
 
 ### Meteor Mobile
 
@@ -294,12 +306,15 @@
   - openssl in mongo: 1.0.2 (from 1.0.1j)
   - MongoDB driver: 1.4.32 (from 1.4.1)
   - bson: 0.2.18 (from 0.2.7)
-  - faye-websocket: 0.9.3 (from 0.8.1)
-  - websocket-driver: 0.5.3 (from 0.4.0)
-  - sockjs server: 0.3.14 (from 0.3.11)
   - request: 2.53.0 (from 2.47.0)
 
 
+Patches contributed by GitHub users 0a-, awatson1978, awwx, bwhitty,
+christianbundy, d4nyll, dandv, DanielDent, DenisGorbachev, fay-jai, gsuess,
+hwillson, jakozaur, meonkeys, mitar, netanelgilad, queso, rbabayoff, RobertLowe,
+romanzolotarev, Siilwyn, and tmeasday.
+
+
 ## v.1.0.3.2, 2015-Feb-25
 
 * Fix regression in 1.0.3 where the `meteor` tool could crash when downloading