From c35a024d3936826e1d70c94ba898a127a0f626f9 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <myaccounts@savant.be>
Date: Fri, 6 Feb 2015 14:06:29 -0500
Subject: [PATCH] Release 0.3.14

---
 HISTORY.md                 | 31 +++++++++++++++++++++++++++++++
 README.md                  |  2 +-
 contrib/dokku-installer.rb |  2 +-
 docs/installation.md       |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 2549b2b8f..249871d05 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,36 @@
 # History
 
+## 0.3.14
+
+- #891: @josegonzalez Keep existing configuration files when installing nginx. Refs #886
+- #892: @josegonzalez Change documentation on where the ssh config PORT is setup
+- #894: @josegonzalez Dokku client improvements
+- #895: @michaelhobbs Document deploying private git submodules. Closes #644
+- #896: @michaelhobbs Add docker-args pluginhook call to build phase. Closes #515
+- #897: @michaelhobbs Official PS plugin
+- #898: @joliv Update man page for 0.3.13
+- #899: @joliv Use help2man to automatically generate man pages
+- #900: @michaelhobbs Support extracting SANs from SSL certificates and adding them to nginx config
+- #901: @misto Pull new tags when upgrading to update VERSION
+- #904: @michaelhobbs Prevent error on restartall when no apps deployed
+- #905: @vincentfretin robv/dokku-elasticsearch not compatible with latest version
+- #907: @vincentfretin Don't use -o pipefail for plugin
+- #914: @michaelhobbs Conditionally set interactive and tty on dokku run. Closes #552. Closes #913
+- #915: @michaelhobbs Document default sites in nginx. Closes #650
+- #916: @michaelhobbs Document build phase troubleshooting suggestions. Closes #841. Closes #911.
+- #917: @michaelhobbs Document resolvconf troubleshooting step. Closes #649
+- #922: @michaelhobbs Use tty cmd to detect if we have one. Closes #921
+- #925: @michaelhobbs Implement rebuild command that reuses git_archive_all
+- #926: @dyson Update Troubleshooting link in README.md.
+- #927: @michaelhobbs Support both docker-args PHASE and docker-args-PHASE. Closes #906
+- #933: @michaelhobbs Remove references to .pem. Closes #930
+- #936: @michaelhobbs Only execute build stack if we have access to /var/run/docker.sock. Closes #929
+- #938: @vincentfretin Enable ssl_prefer_server_ciphers
+- #940: @michaelhobbs Use valid composer json with specified php runtime
+- #941: @michaelhobbs Source global env prior to app env. Closes #931
+- #942: @michaelhobbs Test clojure app
+- #949: @michaelhobbs Common functions library with simple argument parsing. Closes #932. Closes #945
+
 ## 0.3.13
 
 - #815: @abossard Added wordpress installation helper to plugin index
diff --git a/README.md b/README.md
index 2513ecbb3..773c29ed3 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S
 
 To install the latest stable version of dokku, you can run the following bootstrapper command:
 
-    $ wget -qO- https://raw.github.com/progrium/dokku/v0.3.13/bootstrap.sh | sudo DOKKU_TAG=v0.3.13 bash
+    $ wget -qO- https://raw.github.com/progrium/dokku/v0.3.14/bootstrap.sh | sudo DOKKU_TAG=v0.3.14 bash
 
 ### Upgrading
 
diff --git a/contrib/dokku-installer.rb b/contrib/dokku-installer.rb
index 85a95c155..2210db7da 100755
--- a/contrib/dokku-installer.rb
+++ b/contrib/dokku-installer.rb
@@ -21,7 +21,7 @@ if ARGV[0] == "onboot"
   exit
 end
 
-version   = "v0.3.13"
+version   = "v0.3.14"
 dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
 admin_key   = `cat /root/.ssh/authorized_keys`.split("\n").first
 hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
diff --git a/docs/installation.md b/docs/installation.md
index 5a74ca1fd..7718c0aed 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -11,7 +11,7 @@ Ubuntu 14.04 x64 x64. Ideally have a domain ready to point to your host. It's de
 To install the latest stable version of dokku, you can run the following bootstrapper command:
 
 ```shell
-wget -qO- https://raw.github.com/progrium/dokku/v0.3.13/bootstrap.sh | sudo DOKKU_TAG=v0.3.13 bash
+wget -qO- https://raw.github.com/progrium/dokku/v0.3.14/bootstrap.sh | sudo DOKKU_TAG=v0.3.14 bash
 ```
 
 ## Configuring