Merge pull request #869 from palantir/merge-next-into-master

Prepare Release v3.2.0

CHANGELOG.md

@@ -1,6 +1,20 @@
 Change Log
 ===
 
+v3.2.0
+---
+* Stable release containing changes from last two dev releases
+
+v3.2.0-dev.2
+---
+* [bugfix] formatters are now exported correctly to work with TS 1.8 (#863)
+
+v3.2.0-dev.1
+---
+* [bugfix] fixed bug in how custom rules directories are registered (#844)
+* [enhancement] better support for globs in CLI (#827)
+* [new-rule] `no-null-keyword` rule (#722)
+
 v3.1.1
 ---
 * Bump TypeScript peer dependency to `>= 1.7.3` due to `const enum` incompatibility (#832)
@@ -9,6 +23,9 @@ v3.1.0
 ---
 * [bugfix] build with TS v1.7.3 to fix null pointer exception (#832)
 * [bugfix] fixed false positive in `no-require-imports` rule (#816)
+
+v3.1.0-dev.1
+---
 * [bugfix] fixed `no-shadowed-variable` false positives when handling destructuring in function params (#727)
 * [enhancement] `rulesDirectory` in `tslint.json` now supports multiple file paths (#795)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"

src/tslint.ts

@@ -25,7 +25,7 @@ import {ILinterOptions, LintResult} from "./lint";
 import {loadRules} from "./ruleLoader";
 
 class Linter {
-    public static VERSION = "3.1.1";
+    public static VERSION = "3.2.0";
     public static findConfiguration = config;
 
     private fileName: string;