From 28ad20d9e0afcdf59dc94b4337bedcf4d286c133 Mon Sep 17 00:00:00 2001
From: "Nicholas C. Zakas" <nicholas@nczconsulting.com>
Date: Thu, 23 Jul 2015 11:03:44 -0700
Subject: [PATCH] 1.0.0-rc-2

---
 CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de68e8bb553..7d1020af47a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,50 @@
+v1.0.0-rc-2 - July 23, 2015
+
+* Docs: Mention eslint-tester in migration guide (Nicholas C. Zakas)
+* Docs: Mention variables defined in a global comment (fixes #3137) (William Becker)
+* Docs: add documentation about custom-formatters. (fixes #1260) (royriojas)
+* Fix: Multi-line variable declarations indent  (fixes #3139) (Gyandeep Singh)
+* Fix: handles blocks in no-use-before-define (fixes #2960) (Jose Roberto Vidal)
+* Update: `props` option of `no-param-reassign` (fixes #1600) (Toru Nagashima)
+* New: Support shared configs named `@scope/eslint-config`, with shortcuts of `@scope` and `@scope/` (fixes #3123) (Jordan Harband)
+* New: Add ignorePattern, ignoreComments, and ignoreUrls options to max-len (fixes #2934, fixes #2221, fixes #1661) (Benjamin Woodruff)
+* Build: Increase Windows Mocha timeout (fixes #3133) (Ian VanSchooten)
+* Docs: incorrect syntax in the example for rule «one-var» (Alexander Burtsev)
+* Build: Check commit message format at end of tests (fixes #3058) (Ian VanSchooten)
+* Update: Move eslint-tester into repo (fixes #3110) (Nicholas C. Zakas)
+* Fix: Not load configs outside config with `root: true`  (fixes #3109) (Gyandeep Singh)
+* Docs: Add config information to README (fixes #3074) (Nicholas C. Zakas)
+* Docs: Add mysticatea as committer (Nicholas C. Zakas)
+* Docs: Grammar fixes in rule descriptions (refs #3038) (Greg Cochard)
+* Fix: Update sort-vars to ignore Array and ObjectPattern (fixes #2954) (Harry Ho)
+* Fix: block-scoped-var rule incorrectly flagging break/continue with label (fixes #3082) (Aparajita Fishman)
+* Fix: spaces trigger wrong in `no-useless-call` and `prefer-spread` (fixes #3054) (Toru Nagashima)
+* Fix: `arrow-spacing` allow multi-spaces and line-endings (fixes #3079) (Toru Nagashima)
+* Fix: add missing loop scopes to one-var (fixes #3073) (Jose Roberto Vidal)
+* New: the `no-invalid-this` rule (fixes #2815) (Toru Nagashima)
+* Fix: allow empty loop body in no-extra-semi (fixes #3075) (Mathias Schreck)
+* Update: Add qunit to environments (fixes #2870) (Nicholas C. Zakas)
+* Fix: `space-before-blocks` to consider classes (fixes #3062) (Gyandeep Singh)
+* Fix: Include phantomjs globals (fixes #3064) (Linus Unnebäck)
+* Fix: no-else-return handles multiple else-if blocks (fixes #3015) (Jose Roberto Vidal)
+* Fix: `no-*-assgin` rules support destructuring (fixes #3029) (Toru Nagashima)
+* New: the `no-implicit-coercion` rule (fixes #1621) (Toru Nagashima)
+* Fix: Make no-implied-eval match more types of strings (fixes #2898) (Benjamin Woodruff)
+* Docs: Clarify that bot message is automatic (Ian VanSchooten)
+* Fix: Skip rest properties in no-dupe-keys (fixes 3042) (Nicholas C. Zakas)
+* Docs: New issue template (fixes #3048) (Nicholas C. Zakas)
+* Fix: strict rule supports classes (fixes #2977) (Toru Nagashima)
+* New: the `prefer-reflect` rule (fixes #2939) (Keith Cirkel)
+* Docs: make grammar consistent in rules index (Greg Cochard)
+* Docs: Fix unmatched paren in rule description (Greg Cochard)
+* Docs: Small typo fix in no-useless-call documentation (Paul O’Shannessy)
+* Build: readd phantomjs dependency with locked down version (fixes #3026) (Mathias Schreck)
+* Docs: Add IanVS as committer (Nicholas C. Zakas)
+* docs: additional computed-property-spacing documentation (fixes #2941) (Jamund Ferguson)
+* Docs: Add let and const examples for newline-after-var (fixes #3020) (James Whitney)
+* Build: Remove unnecessary phantomjs devDependency (fixes #3021) (Gyandeep Singh)
+* Update: added shared builtins list (fixes #2972) (Jose Roberto Vidal)
+
 v1.0.0-rc-1 - July 15, 2015
 
 * Upgrade: Espree to 2.2.0 (fixes #3011) (Nicholas C. Zakas)
diff --git a/package.json b/package.json
index a92153ca36d..6e7502062d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "1.0.0-rc-1",
+  "version": "1.0.0-rc-2",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {