From 6d84717cbaaa905a19cf8fee6e65c3bf7977c860 Mon Sep 17 00:00:00 2001
From: Matt Zabriskie <mzabriskie@gmail.com>
Date: Sat, 5 Mar 2016 23:15:53 -0700
Subject: [PATCH] Updating dependencies

---
 .eslintrc            |  3 +--
 lib/adapters/http.js |  1 +
 package.json         | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 18a6732..22ae77f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -137,11 +137,10 @@
       "before": false,
       "after": true
     }],
-    "space-after-keywords": 2,       // http://eslint.org/docs/rules/space-after-keywords
+    "keyword-spacing": 2,       // http://eslint.org/docs/rules/keyword-spacing
     "space-before-blocks": 2,        // http://eslint.org/docs/rules/space-before-blocks
     "space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren
     "space-infix-ops": 2,            // http://eslint.org/docs/rules/space-infix-ops
-    "space-return-throw-case": 2,    // http://eslint.org/docs/rules/space-return-throw-case
     "spaced-comment": [2, "always",  {// http://eslint.org/docs/rules/spaced-comment
       "markers": ["global", "eslint"]
     }]
diff --git a/lib/adapters/http.js b/lib/adapters/http.js
index c404679..4befc07 100644
--- a/lib/adapters/http.js
+++ b/lib/adapters/http.js
@@ -10,6 +10,7 @@ var zlib = require('zlib');
 var pkg = require('./../../package.json');
 var Buffer = require('buffer').Buffer;
 
+/*eslint consistent-return:0*/
 module.exports = function httpAdapter(resolve, reject, config) {
   var data = config.data;
   var headers = config.headers;
diff --git a/package.json b/package.json
index bc0c167..09dd868 100644
--- a/package.json
+++ b/package.json
@@ -28,38 +28,38 @@
   },
   "homepage": "https://github.com/mzabriskie/axios",
   "devDependencies": {
-    "coveralls": "2.11.6",
-    "es6-promise": "3.0.2",
+    "coveralls": "2.11.8",
+    "es6-promise": "3.1.2",
     "grunt": "0.4.5",
     "grunt-banner": "0.6.0",
     "grunt-cli": "0.1.13",
-    "grunt-contrib-clean": "0.7.0",
+    "grunt-contrib-clean": "1.0.0",
     "grunt-contrib-nodeunit": "0.4.1",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-eslint": "17.3.1",
+    "grunt-eslint": "18.0.0",
     "grunt-karma": "0.12.1",
     "grunt-ts": "5.3.2",
     "grunt-update-json": "0.2.2",
     "grunt-webpack": "1.0.11",
-    "istanbul-instrumenter-loader": "^0.1.3",
+    "istanbul-instrumenter-loader": "^0.2.0",
     "jasmine-core": "2.4.1",
-    "karma": "0.13.19",
+    "karma": "0.13.21",
     "karma-chrome-launcher": "^0.2.2",
-    "karma-coverage": "0.5.3",
+    "karma-coverage": "0.5.4",
     "karma-firefox-launcher": "^0.1.7",
-    "karma-jasmine": "0.3.6",
+    "karma-jasmine": "0.3.7",
     "karma-jasmine-ajax": "0.1.13",
     "karma-opera-launcher": "^0.3.0",
-    "karma-phantomjs-launcher": "0.2.3",
+    "karma-phantomjs-launcher": "1.0.0",
     "karma-safari-launcher": "^0.1.1",
     "karma-sauce-launcher": "^0.3.1",
     "karma-sinon": "1.0.4",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "1.7.0",
-    "load-grunt-tasks": "3.4.0",
+    "load-grunt-tasks": "3.4.1",
     "minimist": "1.2.0",
-    "phantomjs": "1.9.19",
-    "webpack": "1.12.11",
+    "phantomjs": "2.1.3",
+    "webpack": "1.12.14",
     "webpack-dev-server": "1.14.1"
   },
   "browser": {