Merge pull request #3127 from rachelhigley/master

Changing query-chainer to promise-style

lib/query-chainer.js

@@ -162,12 +162,12 @@ module.exports = (function() {
     var self = this;
     var self = this;
 
 
     emitter
     emitter
-      .success(function(result) {
+      .then(function(result) {
         self.emitterResults[self.emitters.indexOf(emitter)] = result;
         self.emitterResults[self.emitters.indexOf(emitter)] = result;
         self.finishedEmits++;
         self.finishedEmits++;
         finish.call(self, 'emitterResults');
         finish.call(self, 'emitterResults');
       })
       })
-      .error(function(err) {
+      .catch(function(err) {
         self.finishedEmits++;
         self.finishedEmits++;
         self.fails.push(err);
         self.fails.push(err);
         finish.call(self, 'emitterResults');
         finish.call(self, 'emitterResults');