Merge branch 'devel' into release-1.4.2

benmgreene · Sep 22, 2016 · da5f695 · da5f695
2 parents 03c5346 + 942221d
commit da5f695
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 176 deletions.
diff --git a/circle.yml b/circle.yml
@@ -11,7 +11,9 @@ dependencies:
     - ".meteor"
     - ".babel-cache"
   override:
-    - ./meteor --get-ready
+    # shouldn't take longer than 10 minutes
+    - METEOR_PRETTY_OUTPUT=0 ./meteor --get-ready:
+        timeout: 600
 
 test:
   override:

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
diff --git a/packages/npm-mongo/.versions b/packages/npm-mongo/.versions
@@ -0,0 +1,3 @@
+[email protected]
+[email protected]
+[email protected]
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
@@ -3,12 +3,12 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.50-beta.4',
+  version: '1.5.50',
   documentation: null
 });
 
 Npm.depends({
-  mongodb: "2.2.9"
+  mongodb: "2.2.10"
 });
 
 Package.onUse(function (api) {

diff --git a/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json b/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
diff --git a/packages/stylus/.versions b/packages/stylus/.versions
@@ -0,0 +1,35 @@
+[email protected]_1
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+local-test:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
@@ -10,8 +10,8 @@ Package.registerBuildPlugin({
     'plugin/compile-stylus.js'
   ],
   npmDependencies: {
-    stylus: "https://github.com/meteor/stylus/tarball/d4352c9cb4056faf238e6bd9f9f2172472b67c5b", // fork of 0.51.1
-    nib: "1.1.0"
+    stylus: "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449", // fork of 0.54.5
+    nib: "1.1.2"
   }
 });
 

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
@@ -1796,6 +1796,7 @@ var runTestAppForPackages = function (projectContext, options) {
       oplogUrl: process.env.MONGO_OPLOG_URL,
       mobileServerUrl: options.mobileServerUrl,
       once: options.once,
+      noReleaseCheck: options['no-release-check'] || process.env.METEOR_NO_RELEASE_CHECK,
       recordPackageUsage: false,
       selenium: options.selenium,
       seleniumBrowser: options['selenium-browser'],