Merge "Upgraded eslint version"

.eslintrc

@@ -229,6 +229,10 @@ rules:
   # http://eslint.org/docs/rules/no-caller
   no-caller: 2
 
+  # disallow lexical declarations in case clauses
+  # http://eslint.org/docs/rules/no-case-declarations
+  no-case-declarations: 0
+
   # Disallow division operators explicitly at beginning of regular expression
   # http://eslint.org/docs/rules/no-div-regex
   no-div-regex: 2
@@ -241,6 +245,10 @@ rules:
   # http://eslint.org/docs/rules/no-empty-label
   no-empty-label: 2
 
+  # disallow use of empty destructuring patterns
+  # http://eslint.org/docs/rules/no-empty-pattern
+  no-empty-pattern: 0
+
   # Disallow comparisons to null without a type-checking operator
   # http://eslint.org/docs/rules/no-eq-null
   no-eq-null: 2
@@ -293,6 +301,10 @@ rules:
   # http://eslint.org/docs/rules/no-loop-func
   no-loop-func: 2
 
+  # disallow the use of magic numbers
+  # http://eslint.org/docs/rules/no-magic-numbers
+  no-magic-numbers: 0
+
   # Disallow use of multiple spaces
   # http://eslint.org/docs/rules/no-multi-spaces
   no-multi-spaces: 2
@@ -648,6 +660,10 @@ rules:
     - 2
     - max: 1
 
+  # disallow negated conditions
+  # http://eslint.org/docs/rules/no-negated-condition
+  no-negated-condition: 0
+
   # Disallow nested ternary expressions
   # http://eslint.org/docs/rules/no-nested-ternary
   no-nested-ternary: 0
@@ -789,6 +805,10 @@ rules:
   #############################################################################
   # ECMAScript 6 (All Off)
   #############################################################################
+  # require braces in arrow function body
+  # http://eslint.org/docs/rules/arrow-body-style
+  arrow-body-style: 0
+
   # require parens in arrow function arguments
   # http://eslint.org/docs/rules/arrow-parens
   arrow-parens: 0
@@ -805,6 +825,10 @@ rules:
   # http://eslint.org/docs/rules/generator-star-spacing
   generator-star-spacing: 0
 
+  # disallow arrow functions where a condition is expected
+  # http://eslint.org/docs/rules/no-arrow-condition
+  no-arrow-condition: 0
+
   # disallow modifying variables of class declarations
   # http://eslint.org/docs/rules/no-class-assign
   no-class-assign: 0

package.json

@@ -29,10 +29,10 @@
   },
   "homepage": "https://wiki.openstack.org/wiki/QA",
   "peerDependencies": {
-    "eslint": "^1.5.1"
+    "eslint": "^1.10.1"
   },
   "devDependencies": {
-    "eslint": "1.5.1",
+    "eslint": "1.10.1",
     "jasmine": "2.3.1"
   },
   "dependencies": {