Merge branch '0.9.4-pre.2' into devel

Conflicts: History.md packages/meteor-tool/package.js packages/minimongo/package.js packages/package-version-parser/package.js scripts/admin/banners.json scripts/admin/meteor-release-experimental.json
QaDeS · Oct 2, 2014 · c98e6d8 · c98e6d8
2 parents 0365d12 + 2d9bb65
commit c98e6d8
Show file tree

Hide file tree

Showing 151 changed files with 157 additions and 242 deletions.
diff --git a/History.md b/History.md
@@ -24,6 +24,8 @@
 
 * Allow more than one dash in package versions. #2715
 
+* Fix `meteor update` on an app built from a checkout version
+  of Meteor.
 
 ## v0.9.3
 

diff --git a/docs/client/docs.js b/docs/client/docs.js
@@ -1,7 +1,7 @@
 <<<<<<< HEAD
 Template.headline.helpers({
   release: function () {
-    return Meteor.release ? "0.9.4-pre.1" : "(checkout)";
+    return Meteor.release ? "0.9.4-pre.6" : "(checkout)";
   }
 });
 ||||||| merged common ancestors

diff --git a/examples/todos/cordova-build-override/config.xml b/examples/todos/cordova-build-override/config.xml
diff --git a/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-40.png b/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-40.png
diff --git a/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected] b/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected]
diff --git a/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-50.png b/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-50.png
diff --git a/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected] b/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected]
diff --git a/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-60.png b/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-60.png
diff --git a/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected] b/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected]
diff --git a/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-72.png b/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-72.png
diff --git a/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected] b/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected]
diff --git a/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-76.png b/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-76.png
diff --git a/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected] b/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected]
diff --git a/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-small.png b/...s/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon-small.png
diff --git a/...ordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected] b/...ordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected]
diff --git a/...s/todos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon.png b/...s/todos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/icon.png
diff --git a/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected] b/...odos/cordova-build-override/platforms/ios/mdg-todos/Resources/icons/[email protected]
diff --git a/...ld-override/platforms/ios/mdg-todos/Resources/splash/Default-568h@2x~iphone.png b/...ld-override/platforms/ios/mdg-todos/Resources/splash/Default-568h@2x~iphone.png
diff --git a/...override/platforms/ios/mdg-todos/Resources/splash/Default-Landscape@2x~ipad.png b/...override/platforms/ios/mdg-todos/Resources/splash/Default-Landscape@2x~ipad.png
diff --git a/...ld-override/platforms/ios/mdg-todos/Resources/splash/Default-Landscape~ipad.png b/...ld-override/platforms/ios/mdg-todos/Resources/splash/Default-Landscape~ipad.png
diff --git a/...-override/platforms/ios/mdg-todos/Resources/splash/Default-Portrait@2x~ipad.png b/...-override/platforms/ios/mdg-todos/Resources/splash/Default-Portrait@2x~ipad.png
diff --git a/...ild-override/platforms/ios/mdg-todos/Resources/splash/Default-Portrait~ipad.png b/...ild-override/platforms/ios/mdg-todos/Resources/splash/Default-Portrait~ipad.png
diff --git a/...a-build-override/platforms/ios/mdg-todos/Resources/splash/Default@2x~iphone.png b/...a-build-override/platforms/ios/mdg-todos/Resources/splash/Default@2x~iphone.png
diff --git a/...dova-build-override/platforms/ios/mdg-todos/Resources/splash/Default~iphone.png b/...dova-build-override/platforms/ios/mdg-todos/Resources/splash/Default~iphone.png
diff --git a/examples/todos/cordova-build-override/platforms/ios/mdg-todos/mdg-todos-Info.plist b/examples/todos/cordova-build-override/platforms/ios/mdg-todos/mdg-todos-Info.plist
diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.1.2-pre.0"
+  version: "1.1.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function(api) {

diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function(api) {

diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function(api) {

diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function(api) {

diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.2-pre.0"
+  version: "1.1.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.0.3-pre.0"
+  version: "1.0.3-pre.2"
 });
 
 Package.on_use(function(api) {

diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function(api) {

diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.3-pre.0"
+  version: "1.1.3-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/accounts-ui/package.js b/packages/accounts-ui/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simple templates to add login widgets to an app",
-  version: "1.1.2-pre.0"
+  version: "1.1.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function(api) {

diff --git a/packages/appcache/package.js b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/application-configuration/package.js b/packages/application-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Interaction with the configuration sources for your apps",
-  version: '1.0.3-pre.0'
+  version: '1.0.3-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/audit-argument-checks/package.js b/packages/audit-argument-checks/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Try to detect inadequate input sanitization",
-  version: '1.0.1-pre.0'
+  version: '1.0.1-pre.2'
 });
 
 // This package is empty; its presence is detected by livedata.
diff --git a/packages/autopublish/package.js b/packages/autopublish/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish the entire database to all clients",
-  version: '1.0.1-pre.0'
+  version: '1.0.1-pre.2'
 });
 
 // This package is empty; its presence is detected by livedata and

diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.1.2-pre.0'
+  version: '1.1.2-pre.2'
 });
 
 Cordova.depends({

diff --git a/packages/base64/package.js b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.1-pre.0'
+  version: '1.0.1-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.1-pre.0'
+  version: '1.0.1-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/blaze-tools/package.js b/packages/blaze-tools/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Compile-time tools for Blaze",
-  version: '1.0.1-pre.0'
+  version: '1.0.1-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/blaze/package.js b/packages/blaze/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor Reactive Templating library",
-  version: '2.0.2-pre.0'
+  version: '2.0.2-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.1-pre.0'
+  version: '1.0.1-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.1-pre.0"
+  version: "1.0.1-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure security policies enforced by the browser",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.1-pre.0'
+  version: '1.0.1-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/check/package.js b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.0.2-pre.0'
+  version: '1.0.2-pre.2'
 });
 
 Package.on_use(function (api) {

diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.1-pre.0"
+  version: "1.0.1-pre.2"
 });
 
 // XXX this code dumps symbols into the global namespace (directly

diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.1-pre.0"
+  version: "1.0.1-pre.2"
 });
 
 Package.on_use(function (api) {

diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.0.4-pre.0"
+  version: "1.0.4-pre.2"
 });
 
 Package._transitional_registerBuildPlugin({

diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.0.15-pre.0"
+  version: "1.0.15-pre.2"
 });
 
 Npm.depends({

diff --git a/packages/ctl-helper/package.js b/packages/ctl-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Helpers for control programs",
-  version: "1.0.4-pre.0"
+  version: "1.0.4-pre.2"
 });
 
 Npm.depends({optimist: '0.6.0'});

diff --git a/packages/ctl/package.js b/packages/ctl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Default control program for an application",
-  version: "1.0.2-pre.0"
+  version: "1.0.2-pre.2"
 });
 
 Package.on_use(function (api) {