From 79844a46b89e4f8979089202ca230227df9fbe14 Mon Sep 17 00:00:00 2001
From: Jenkins <root@dbis-tests.uibk.ac.at>
Date: Wed, 2 Sep 2015 13:28:13 +0200
Subject: [PATCH] Updating changelog

---
 CHANGELOG.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e831d9..23a30b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,11 @@ Upcoming version:
   - updating gradle scmversion plugin (Nikolaus Krismer)
   - added contribution guidelines (Nikolaus Krismer)
   - moving gradle changelog tasks to separate buildscript (Nikolaus Krismer)
+
+Version v0.5.1:
+---------------
   - fixing problems in changelog generation (again) (Nikolaus Krismer)
+  - Merge branch 'master' of git@dbis-git.uibk.ac.at:krismer/isochrone-vm.git (Nikolaus Krismer)
   - calling grgit add before grgit commit (by now push is empty) (Nikolaus Krismer)
   - not commiting changelogs in jenkins without changes :-) (Nikolaus Krismer)
   - improving gradle changelog mechanism (excluding jenkins commits) (Nikolaus Krismer)
@@ -14,9 +18,6 @@ Upcoming version:
   - fixing problems with gradle's clean task (Nikolaus Krismer)
   - fixing invalid clean task definition (Nikolaus Krismer)
   - adding removal of CHANGELOG to clean task (Nikolaus Krismer)
-
-Version v0.5.1:
----------------
   - removed hard-coded version from gradle (is set using scmversion plugin) (Nikolaus Krismer)
   - added density generation for synthethic networks (Nikolaus Krismer)
   - removed pgRouting / osm2pgrouting from files (not needed and never used) (Nikolaus Krismer)
@@ -41,6 +42,7 @@ Version v0.5.0:
   - geoserver version update (Nikolaus Krismer)
   - always adding pg_procedures to created database (not only when postgis is installed) (Nikolaus Krismer)
   - added installation of phpLiteAdmin and spatialite (Nikolaus Krismer)
+  - Merge branch 'master' of git@dbis-git.uibk.ac.at:krismer/isochrone-vm.git (Nikolaus Krismer)
   - source profile in init script so it works without problems in centos 6 with the service command (Nikolaus Krismer)
   - Fixed tomcat startup message (root)
   - creating directories needed by script at the beginning (Nikolaus Krismer)
-- 
GitLab