Merged v1.5.1 release into master.

dsmrreader · Jan 4, 2017 · 4f110c6 · 4f110c6
1 parent 9ccefcf
commit 4f110c6
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 165 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -7,7 +7,7 @@ export GIT_PAGER=cat
 
 # Abort when user not sure.
 if [ $? -ne 0 ]; then
-    echo "[!] pre-deployment: user aborted or script failed"
+    echo "[!] Halted in pre-deployment: Either user ABORTED or script FAILED"
     exit;
 fi
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -17,6 +17,19 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
     - `About upgrading <http://dsmr-reader.readthedocs.io/en/latest/application.html#application-updates-bug-fixes-new-features>`_.
 
 
+v1.5.1 - 2017-01-04
+^^^^^^^^^^^^^^^^^^^
+
+.. note::
+
+    This patch contains no new features and **only solves upgrading issues** for some users.
+
+
+**Tickets resolved in this release:**
+
+- Fix for issues `#200 <https://github.com/dennissiemensma/dsmr-reader/issues/200>`_ & `#217 <https://github.com/dennissiemensma/dsmr-reader/issues/217>`_, which is caused by omitting the switch to the VirtualEnv. This was not documented well enough in early versions of this project, causing failed upgrades. 
+
+
 v1.5.0 - 2017-01-01
 ^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/locale/nl/LC_MESSAGES/changelog.mo b/docs/locale/nl/LC_MESSAGES/changelog.mo