Merge branch 'next' of github.com:palantir/tslint into next

CHANGELOG.md

@@ -1,6 +1,12 @@
 Change Log
 ===
 
+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 +15,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-dev.1",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"
@@ -36,11 +36,11 @@
     "grunt-ts": "^5.1.0",
     "grunt-tslint": "latest",
     "mocha": "^2.2.5",
-    "tslint": "latest",
-    "typescript": "latest"
+    "tslint": "next",
+    "typescript": "next"
   },
   "peerDependencies": {
-    "typescript": ">=1.7.3"
+    "typescript": ">=1.7.3 || >=1.7.0-dev.20151003 || >=1.8.0-dev"
   },
   "license": "Apache-2.0"
 }

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-dev.1";
     public static findConfiguration = config;
 
     private fileName: string;