Merge pull request #1031 from palantir/v3.6.0

Prepare release v3.6.0
palantir · Mar 12, 2016 · 80c68fd · 80c68fd
2 parents d6fc245 + bf8211d
commit 80c68fd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,22 @@
 Change Log
 ===
 
+v3.6.0
+---
+* Stable release containing changes from the last dev release
+
+v3.6.0-dev.1
+---
+* [enhancement] Add `--exclude` CLI option (#915)
+* [bugfix] Fix `no-shadowed-variable` rule handling of standalone blocks (#1021)
+* [deprecation] Configuration through `package.json` files (#1020)
+* [API] Export additional configuration methods from top-level "tslint" module (#1009)
+
+Thanks to our contributors!
+* @blakeembrey
+* @hamhut1066
+* @meowtec
+
 v3.5.0
 ---
 * Stable release containing changes from the last dev release

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"

diff --git a/src/tslint.ts b/src/tslint.ts
@@ -25,7 +25,7 @@ import {ILinterOptions, LintResult} from "./lint";
 import {loadRules} from "./ruleLoader";
 
 class Linter {
-    public static VERSION = "3.5.0";
+    public static VERSION = "3.6.0";
     public static findConfiguration = findConfiguration;
     public static findConfigurationPath = findConfigurationPath;
     public static getRulesDirectories = getRulesDirectories;