Merge "Update ESLint devDependencies in package.json"

.eslintrc

@@ -37,6 +37,8 @@ rules:
   space-in-parens: 1
   no-use-before-define: 1
   no-unneeded-ternary: 1
+  consistent-return: 0
+  no-unmodified-loop-condition: 0
 
   #############################################################################
   # Angular Plugin Customization

openstack_dashboard/static/js/.eslintrc

@@ -12,6 +12,7 @@ rules:
   one-var: 0
   space-infix-ops: 0
   space-after-keywords: 0
+  keyword-spacing: 0
   no-console: 0
   no-multiple-empty-lines: 0
   no-sync: 0

package.json

@@ -6,14 +6,14 @@
   "repository": "none",
   "license": "Apache 2.0",
   "devDependencies": {
-    "eslint": "1.10.3",
-    "eslint-config-openstack": "1.2.4",
-    "eslint-plugin-angular": "1.0.1",
+    "eslint": "3.0.0",
+    "eslint-config-openstack": "4.0.1",
+    "eslint-plugin-angular": "4.0.1",
     "jasmine-core": "2.4.1",
     "karma": "1.1.2",
-    "karma-firefox-launcher": "2.1.0",
     "karma-cli": "1.0.1",
     "karma-coverage": "1.1.1",
+    "karma-firefox-launcher": "2.1.0",
     "karma-jasmine": "1.0.2",
     "karma-ng-html2js-preprocessor": "1.0.0",
     "karma-threshold-reporter": "0.1.15"