Merge pull request #918 from palantir/v3.2.2

Prepare release v3.2.2
palantir · Jan 18, 2016 · 225b452 · 225b452
2 parents 5ea4a46 + 7aa02b7
commit 225b452
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 Change Log
 ===
 
+v3.2.2
+---
+* Stable release containing changes from the last dev release
+
+v3.2.2-dev.1
+---
+* [enhancement] Throw an error if a path to a directory of custom rules is invalid (#910)
+* [new-rule-option] "jsx-single" and "jsx-double" options for `quotemark` rule (#673)
+* [bugfix] Handle paths to directories of custom rules more accurately
+* [bugfix] `no-unused-expression` rule handles `await` statements correctly (#887)
+
 v3.2.1
 ---
 * 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.2.1",
+  "version": "3.2.2",
   "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.2.1";
+    public static VERSION = "3.2.2";
     public static findConfiguration = config;
 
     private fileName: string;