From f52ce31daeb0977860854ba0673d255d73f4ddca Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Fri, 28 Aug 2015 10:42:40 -0700
Subject: [PATCH] Updated eslint to 1.2.1

This patch updates eslint to 1.2.1, and adds all new rules that
were added in a disabled state.

Change-Id: I523ade5c7fc9a44dfe4b9fe8ea7f7b2c71ebf85e
---
 .eslintrc    | 16 ++++++++++++++++
 package.json |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 08be54a..2a1e658 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -514,6 +514,10 @@ rules:
   # http://eslint.org/docs/rules/array-bracket-spacing
   array-bracket-spacing: 0 # TODO(krotscheck): Discuss & Activate
 
+  # disallow or enforce spaces inside of single line blocks
+  # http://eslint.org/docs/rules/block-spacing
+  block-spacing: 0 # TODO(krotscheck): Discuss & Activate
+
   # Enforce one true brace style
   # http://eslint.org/docs/rules/brace-style
   brace-style: 0 # TODO(krotscheck): Discuss & Activate
@@ -775,6 +779,10 @@ rules:
   # http://eslint.org/docs/rules/no-const-assign
   no-const-assign: 0
 
+  # disallow duplicate name in class members
+  # http://eslint.org/docs/rules/no-dupe-class-members
+  no-dupe-class-members: 0
+
   # disallow use of this/super before calling super() in constructors
   # http://eslint.org/docs/rules/no-this-before-super
   no-this-before-super: 0
@@ -787,6 +795,10 @@ rules:
   # http://eslint.org/docs/rules/object-shorthand
   object-shorthand: 0
 
+  # suggest using arrow functions as callbacks
+  # http://eslint.org/docs/rules/prefer-arrow-callback
+  prefer-arrow-callback: 0
+
   # suggest using of const declaration for variables that are never modified after declared
   # http://eslint.org/docs/rules/prefer-const
   prefer-const: 0
@@ -799,6 +811,10 @@ rules:
   # http://eslint.org/docs/rules/prefer-reflect
   prefer-reflect: 0
 
+  # suggest using template literals instead of strings concatenation
+  # http://eslint.org/docs/rules/prefer-template
+  prefer-template: 0
+
   # disallow generator functions that do not have yield
   # http://eslint.org/docs/rules/require-yield
   require-yield: 0
diff --git a/package.json b/package.json
index 77d4e4f..5fa3255 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,10 @@
   },
   "homepage": "https://wiki.openstack.org/wiki/QA",
   "peerDependencies": {
-    "eslint": "^1.0.0"
+    "eslint": "^1.2.1"
   },
   "devDependencies": {
-    "eslint": "1.0.0",
+    "eslint": "1.2.1",
     "jasmine": "2.3.1"
   },
   "dependencies": {