github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into release-1.3.3

Browse Source
This commit is contained in:
Ben Newman
2016-06-06 15:30:26 -04:00
parent 31b080ddb3 2925cf242e
commit 1f840e7a50
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
History.md
View File

@@ -40,6 +40,7 @@
* Insert a `Date` header into emails by default: https://github.com/meteor/meteor/pull/6916/files
* `meteor test` now supports setting the bind address using `--port IP:PORT` the same as `meteor run` [PR #6964](https://github.com/meteor/meteor/pull/6964) [Issue #6961](https://github.com/meteor/meteor/issues/6961)
* `Meteor.apply` now takes a `noRetry` option to opt-out of automatically retrying non-idempotent methods on connection blips: [PR #6180](https://github.com/meteor/meteor/pull/6180)
* DDP callbacks are now batched on the client side. This means that after a DDP message arrives, the local DDP client will batch changes for a minimum of 5ms (configurable via `bufferedWritesInterval`) and a maximum of 500ms (configurable via `bufferedWritesMaxAge`) before calling any callbacks (such as cursor observe callbacks).

2
tools/isobuild/meteor-npm.js
View File

@@ -782,7 +782,7 @@ var installFromShrinkwrap = function (dir) {
// dependencies. `npm install` times out after more than a minute.
var ensureConnected = function () {
try {
httpHelpers.getUrl("http://registry.npmjs.org");
httpHelpers.getUrl(process.env.NPM_CONFIG_REGISTRY || "http://registry.npmjs.org");
} catch (e) {
buildmessage.error("Can't install npm dependencies. " +
"Are you connected to the internet?");