Merge pull request #190 from hernando/master

Release preparations.
Eyescale · Jun 30, 2016 · 27def54 · 27def54
2 parents 7ffbfab + 382cc17
commit 27def54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,8 +3,8 @@
 #                         Stefan Eilemann <[email protected]>
 
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(Collage VERSION 1.4.0)
-set(Collage_VERSION_ABI 4)
+project(Collage VERSION 1.5.0)
+set(Collage_VERSION_ABI 5)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
   ${CMAKE_SOURCE_DIR}/CMake/common)

diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -1,6 +1,12 @@
 # Changelog {#Changelog}
 
-# git master
+# Release 1.5 (30-Jul-2016)
+
+* [188](https://github.com/Eyescale/Collage/pull/188)
+  Improved robustness in RDMA connection estalishment to account for variations
+  of behaviour in librdmacm.
+* [186](https://github.com/Eyescale/Collage/pull/186)
+  Obsolete SDP connection removed.
 
 # Release 1.4 (11-Mar-2016)