From 044ef8afd0f5b0078b88894f63cda56c333b3f63 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Tue, 29 Sep 2015 07:13:16 -0700
Subject: [PATCH] Upgraded eslint version

This upgrades the eslint version to 1.5.1, and ensures that all
new rules are disabled.

Change-Id: I9e5f0698af95b16f975b89f0a86c60a977acbf37
---
 .eslintrc    | 24 ++++++++++++++++++++++++
 package.json |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 7d7606a..0451bb4 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -373,6 +373,10 @@ rules:
   # http://eslint.org/docs/rules/no-useless-call
   no-useless-call: 0 # TODO(krotscheck): Discuss & Activate
 
+  # disallow unnecessary concatenation of literals or template literals
+  # http://eslint.org/docs/rules/no-useless-concat
+  no-useless-concat: 0
+
   # Disallow use of void operator
   # http://eslint.org/docs/rules/no-void
   no-void: 2
@@ -477,6 +481,10 @@ rules:
   # http://eslint.org/docs/rules/callback-return
   callback-return: 2
 
+  # disallow require() outside of the top-level module scope
+  # http://eslint.org/docs/rules/global-require
+  global-require: 0
+
   # Enforces error handling in callbacks
   # http://eslint.org/docs/rules/handle-callback-err
   handle-callback-err: 2
@@ -573,6 +581,10 @@ rules:
     - 2
     - SwitchCase: 1
 
+  # specify whether double or single quotes should be used in JSX attributes
+  # http://eslint.org/docs/rules/jsx-quotes
+  jsx-quotes: 0
+
   # Enforces spacing between keys and values in object literal properties
   # http://eslint.org/docs/rules/key-spacing
   key-spacing: 0 # TODO(krotscheck): Discuss & Activate
@@ -639,6 +651,10 @@ rules:
   # http://eslint.org/docs/rules/no-new-object
   no-new-object: 1
 
+  # Disallow certain syntax (no-restricted-syntax)
+  # http://eslint.org/docs/rules/no-restricted-syntax
+  no-restricted-syntax: 0
+
   # Disallow space between function identifier and application
   # http://eslint.org/docs/rules/no-spaced-func
   no-spaced-func: 0 # TODO(krotscheck): Discuss & Activate
@@ -692,6 +708,10 @@ rules:
   # http://eslint.org/docs/rules/quotes
   quotes: 0
 
+  # Require JSDoc comment
+  # http://eslint.org/docs/rules/require-jsdoc
+  require-jsdoc: 0
+
   # Enforce spacing before and after semicolons
   # http://eslint.org/docs/rules/semi-spacing
   semi-spacing:
@@ -713,6 +733,10 @@ rules:
   # http://eslint.org/docs/rules/space-after-keywords
   space-after-keywords: 2
 
+  # Require a space before certain keywords
+  # http://eslint.org/docs/rules/space-before-keywords
+  space-before-keywords: 0
+
   # require or disallow space before blocks
   # http://eslint.org/docs/rules/space-before-blocks
   space-before-blocks:
diff --git a/package.json b/package.json
index 5d2b5fa..e7e3c0d 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,10 @@
   },
   "homepage": "https://wiki.openstack.org/wiki/QA",
   "peerDependencies": {
-    "eslint": "^1.2.1"
+    "eslint": "^1.5.1"
   },
   "devDependencies": {
-    "eslint": "1.2.1",
+    "eslint": "1.5.1",
     "jasmine": "2.3.1"
   },
   "dependencies": {