Merge branch 'master' into devel

XiaoDongLiu · Mar 18, 2015 · 601f007 · 601f007
2 parents 8ac310b + c775e1e
commit 601f007
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 13 deletions.
diff --git a/History.md b/History.md
@@ -46,6 +46,12 @@
   - uglify-js: 2.4.17 (from 2.4.13)
 
 
+## v1.0.4.1, 2015-Mar-18
+
+* Fix regression in 1.0.4 where `meteor publish-for-arch` only worked for
+  packages without colons in their name.  #3951
+
+
 ## v1.0.4, 2015-Mar-17
 
 ### Mongo Driver

diff --git a/docs/.meteor/packages b/docs/.meteor/packages
@@ -8,9 +8,7 @@ jquery
 underscore
 showdown
 spiderable
-appcache
 reload-safetybelt
 simple:markdown-templating
 simple:highlight.js
 less
-force-ssl
diff --git a/docs/.meteor/release b/docs/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/docs/.meteor/versions b/docs/.meteor/versions
@@ -1,4 +1,3 @@
-[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -11,7 +10,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]

diff --git a/docs/client/helpers.js b/docs/client/helpers.js
@@ -1,4 +1,4 @@
-release = Meteor.release ? "1.0.4" : "(checkout)";
+release = Meteor.release ? "1.0.4.1" : "(checkout)";
 
 Template.registerHelper("release", release);
 

diff --git a/docs/lib/appcache-config.js b/docs/lib/appcache-config.js
@@ -1,4 +1,5 @@
 if (Meteor.isServer) {
+/*
   Meteor.AppCache.config({
     // Turn off appcache on Safari. Apparently Safari 7's AppCache is totally
     // busted. In particular, this fact combined with our "RELOAD_SAFETYBELT"
@@ -9,4 +10,5 @@ if (Meteor.isServer) {
     // ... and Firefox too.  See eg https://github.com/meteor/meteor/issues/3248
     firefox: false
   });
+*/
 }
diff --git a/examples/clock/.meteor/release b/examples/clock/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/examples/localmarket/.meteor/release b/examples/localmarket/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.0.42'
+  version: '1.0.43'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json
@@ -5,7 +5,13 @@
                    "0.9.2.1", "0.9.2.2", "0.9.3", "0.9.3.1", "0.9.4", "1.0", "1.0.1", "1.0.2", "1.0.2.1",
                    "1.0.3", "1.0.3.1", "1.0.3.2"],
       "banner": {
-        "text": "=> Meteor 1.0.4: MongoDB 2.6 and 3.0 support, performance improvements,\n   Cordova upgrades, template-specific subscriptions, and more!\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4 by running 'meteor update'."
+        "text": "=> Meteor 1.0.4.1: MongoDB 2.6 and 3.0 support, performance improvements,\n   Cordova upgrades, template-specific subscriptions, and more!\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4.1 by running 'meteor update'."
+      }
+    },
+    {
+      "versions": ["1.0.4"],
+      "banner": {
+        "text": "=> Meteor 1.0.4.1: Fixes a regression in publishing packages in 1.0.4.\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4.1 by running 'meteor update'."
       }
     }
   ]

diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,7 @@
 {
     "track": "METEOR",
-    "version": "1.0.4",
+    "version": "1.0.4.1",
+    "patchFrom": ["1.0.4"],
     "recommended": false,
     "official": true,
     "description": "The Official Meteor Distribution"