Merge pull request #29 from maseb/fix-defer-result

Propagate result when using defer.
gabrielhurley · Oct 14, 2014 · 65d5d8b · 65d5d8b
2 parents cb41c09 + 56a7a53
commit 65d5d8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/base.js b/client/base.js
@@ -320,7 +320,7 @@ var Client = Class.extend({
         return params.defer(result, function (e, r) {
           params.defer = null;
           result = r || result;
-          end(e);
+          end(e, result);
         });
       }
       if (err && params.error) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openclient",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "An opinionated client for RESTful APIs (particularly OpenStack's).",
   "homepage": "https://github.com/gabrielhurley/js-openclient",
   "keywords": ["client", "rest", "openstack"],