From 2a428ffcb63492f32eb07409bb2f3c5d716d89e2 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 10 Oct 2016 15:25:53 -0700
Subject: [PATCH] Change log and version bump

---
 CHANGELOG.md | 19 +++++++++++++++++++
 VERSION      |  2 +-
 bin/dsh      |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2dc3b7..42b90ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## 1.5.0 (2016-10-10)
+
+IMPORTANT: Please run `dsh update images` after updating to this release.
+
+- Refactored ssh-add and fixed issues on Windows
+- Bats tests for Drude
+- Fixes for installation on Ubuntu
+- Use standard docker.sock location with vhost-proxy service
+- Removed references to `console.exe` (old winpty version) on Windows - this fixes `dsh bash` on older installations 
+- Docs
+  - Added Sass docs
+  - Added blackfire.io docs
+  - Updated mailhog docs (now with a permanent approach)
+  - Updated xdebug docs (using xdebug with console scripts, e.g. drush)
+  - Updated Behat docs (additional info about Behat configuration)
+  - Moved license to a separate file
+  - Retirement announcement
+
+
 ## 1.4.1 (2016-07-01)
 
 - Hotfixes
diff --git a/VERSION b/VERSION
index 13175fd..3e1ad72 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.1
\ No newline at end of file
+1.5.0
\ No newline at end of file
diff --git a/bin/dsh b/bin/dsh
index 4cef95a..5e658f4 100755
--- a/bin/dsh
+++ b/bin/dsh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DSH_VERSION=1.20.7
+DSH_VERSION=1.21.0
 
 # Console colors
 red='\033[0;91m'