Merge pull request sequelize#2882 from alubbe/master

updated bluebird to 2.6.2
ryanalane · Jan 20, 2015 · e45aa95 · e45aa95
2 parents 047995c + 893c377
commit e45aa95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/promise.js b/lib/promise.js
@@ -72,8 +72,8 @@ Promise.prototype._then = function (didFulfill, didReject, didProgress, receiver
 
 var bluebirdSettle = Promise.prototype._settlePromiseAt;
 Promise.prototype._settlePromiseAt = function (index) {
-  bluebirdSettle.call(this, index);
   var receiver = this._receiverAt(index);
+  bluebirdSettle.call(this, index);
 
   if (this.$sql && receiver && receiver.emit) {
     this.$sql.forEach(function (sql) {

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "url": "https://github.com/sequelize/sequelize/issues"
   },
   "dependencies": {
-    "bluebird": "~2.3.11",
+    "bluebird": "2.4.2",
     "dottie": "0.2.4",
     "generic-pool": "2.1.1",
     "inflection": "1.5.3",