From c98d916fa77b199ef12ecc1e6503e357af1eeffd Mon Sep 17 00:00:00 2001
From: Adi Dahiya <adi.dahiya14@gmail.com>
Date: Mon, 1 Apr 2019 18:36:31 -0400
Subject: [PATCH] Prepare release v5.15.0 (#4621)

---
 CHANGELOG.md  | 33 +++++++++++++++++++++++++++++++++
 package.json  |  2 +-
 src/linter.ts |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 578ca9baa74..d959ea308d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Change Log
 
+## v5.15.0
+
+- [api] `WalkContext` and `AbstractWalker` type parameter defaults to `void` (#2600)
+- [bugfix] [`no-void-expression`](https://palantir.github.io/tslint/rules/no-void-expression/) now allows conditional expressions (#4606)
+- [bugfix] fix linebreak handling in [`ordered-imports`](https://palantir.github.io/tslint/rules/ordered-imports/) (#4583)
+- [bugfix] fix [`static-this`](https://palantir.github.io/tslint/rules/static-this/) false positive for higher order components (#4580)
+- [bugfix] Fixed crash in [`unnecessary-else`](https://palantir.github.io/tslint/rules/unnecessary-else/) from blank `if` statements (#4603)
+- [bugfix] Fixed false positive in [`unnecessary-else`](https://palantir.github.io/tslint/rules/unnecessary-else/) after non-jumping statement (#4603)
+- [bugfix] [`interface-name`](https://palantir.github.io/tslint/rules/interface-name/) now handles interface starting with "I18n" correctly (#4486)
+- [bugfix] [`no-string-throw`](https://palantir.github.io/tslint/rules/no-string-throw/) fix inserts whitespace if not present after `throw` keyword (#4540)
+- [bugfix] [`quotemark`](https://palantir.github.io/tslint/rules/quotemark/): fix some edge cases for `backtick` option (#4618)
+- [bugfix] [`unnecessary-constructor`](https://palantir.github.io/tslint/rules/unnecessary-constructor/): don't flag non-private constructors that are actually necessary (#4619)
+- [enhancement] Upgrade js-yaml to avoid security issue (#4595)
+- [new-rule-option] `allow-single-line-comments` option for [`file-header`](https://palantir.github.io/tslint/rules/file-header/) rule (#4560)
+- [new-rule-option] `ignore-rest-args` option for [`no-any`](https://palantir.github.io/tslint/rules/no-any/) rule (#4581)
+- [new-rule] [`no-null-undefined-union`](https://palantir.github.io/tslint/rules/no-null-undefined-union/) (#4589)
+
+Thanks to our contributors!
+
+- Max Belsky
+- Steve Moser
+- Christian Flach
+- Roman Rogowski
+- Terry
+- Luke
+- Andy Hanson
+- Vitalij Krotov
+- Josh Goldberg
+- Vincent Langlet
+- Neha Rathi
+- Eric Ferreira
+
+
 ## v5.14.0
 
 - [bugfix] `backtick` option for [`quotemark`](https://palantir.github.io/tslint/rules/quotemark/) rule no longer incorrectly flags string literals that must use single/double quotes (#4535)
diff --git a/package.json b/package.json
index 2880a5dd347..4202b14552e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tslint",
-    "version": "5.14.0",
+    "version": "5.15.0",
     "description": "An extensible static analysis linter for the TypeScript language",
     "bin": {
         "tslint": "./bin/tslint"
diff --git a/src/linter.ts b/src/linter.ts
index 3190d6c25b9..a25ed99a627 100644
--- a/src/linter.ts
+++ b/src/linter.ts
@@ -42,7 +42,7 @@ import { arrayify, dedent, flatMap, mapDefined } from "./utils";
  * Linter that can lint multiple files in consecutive runs.
  */
 export class Linter {
-    public static VERSION = "5.14.0";
+    public static VERSION = "5.15.0";
 
     public static findConfiguration = findConfiguration;
     public static findConfigurationPath = findConfigurationPath;