From ddd9ece65cbb03e6c04eacefde09e54acf55834c Mon Sep 17 00:00:00 2001
From: Jason Killian <jkillian@palantir.com>
Date: Fri, 19 Feb 2016 16:59:52 -0500
Subject: [PATCH] Prepare release v3.4.0-dev.2

---
 CHANGELOG.md  | 19 ++++++++++++++++++-
 package.json  |  2 +-
 src/tslint.ts |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6562b204ed9..355af547d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,23 @@
 Change Log
 ===
 
+v3.4.0-dev.2
+---
+* [new-rule-option] "arrow-parameter" option for `typedef` rule (#333)
+* [new-rule-option] "never" option for `semicolon` rule (#363)
+* [new-rule-option] "onespace" setting for `typedef-whitespace` rule (#888)
+* [new-rule-option] `typedef-whitespace` rule can now check spacing on right side of typdef colon (#888)
+* [enhancement] `member-ordering` rule treats arrow functions as methods (#226)
+* [bugfix] Handle spaces before typedefs correctly in `typedef-whitespace` rule (#955)
+* [bugfix] `label-position` rule now allows labels on `for-of` loops (#959)
+
+Thanks to our contributors!
+* @b0r3as
+* @ChaseMoskal
+* @Pajn
+* @pe8ter
+* @tomduncalf
+
 v3.4.0-dev.1
 ---
 * [enhancement] Revamped testing system (#620)
@@ -10,7 +27,7 @@ v3.4.0-dev.1
 * [bugfix] Fix handling of multiline literals in `trailing-comma` rule (#856)
 * [bugfix] `one-line` rule correctly checks space between `catch` and opening brace (#925)
 * [bugfix] `one-line` rule correctly checks multiline variable declarations (#935)
-* [enhancement] New option `check-finally` for `one-line` rule (#925)
+* [new-rule-option] New option `check-finally` for `one-line` rule (#925)
 * __BREAKING CHANGES__
   * [bugfix] Report error when a rule in the config file is not found (#598)
 
diff --git a/package.json b/package.json
index ca9661f8f38..cb46780b813 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.4.0-dev.1",
+  "version": "3.4.0-dev.2",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"
diff --git a/src/tslint.ts b/src/tslint.ts
index d6d1a2be689..822840d3043 100644
--- 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.4.0-dev.1";
+    public static VERSION = "3.4.0-dev.2";
     public static findConfiguration = config;
 
     private fileName: string;