Release preparation (#211)

HBPVIS · May 24, 2017 · 9ecd76b · 9ecd76b
1 parent 2fddb4a
commit 9ecd76b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1 @@
 .travis.yml merge=ours
-CMake/FindPackages.cmake merge=ours
-CMake/FindRequired.cmake merge=ours
-CMake/GitExternal.cmake merge=ours
-CMake/depends.txt merge=ours
diff --git a/.gitsubprojects b/.gitsubprojects
@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-git_subproject(Servus https://github.com/HBPVIS/Servus.git bb88876)
+git_subproject(Servus https://github.com/HBPVIS/Servus.git 6998512)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ common_find_package(Servus REQUIRED)
 common_find_package(Threads REQUIRED)
 common_find_package_post()
 
-set(LCOV_EXCLUDE "zeroeq/http/jsoncpp/*")
+set(LCOV_EXCLUDE "zeroeq/http/jsoncpp/*;cppnetlib/boost/network/*;cppnetlib/libs/network/src/uri/*")
 
 add_subdirectory(zeroeq)
 add_subdirectory(tests)

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ build environments are tested:
 ZeroEQ requires the following external, pre-installed dependencies:
 
 * ZeroMQ 4.0 or later
-* Boost (tested with 1.54) for unit tests
+* Boost for unit tests; version 1.58 for optional cppnetlib
 
 Building from source is as simple as:
 

diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -1,6 +1,6 @@
 # Changelog {#Changelog}
 
-# git master
+# Release 0.8 (24-05-2017)
 
 * [210](https://github.com/HBPVIS/ZeroEQ/pull/210):
   http::Server:
@@ -19,6 +19,8 @@
     * use a std::future to avoid blocking the main thread
     * register a single endpoint for collections
     * filter collections using a query string with GET requests
+* [203](https://github.com/HBPVIS/ZeroEQ/pull/203):
+  Upgrade to upstream cppnet-lib 0.13-release
 * [192](https://github.com/HBPVIS/ZeroEQ/pull/192):
   Fix HTTP server segfault when registering an empty endpoint, throw an
   exception instead.

diff --git a/doc/feature/rfcs.md b/doc/feature/rfcs.md
@@ -3,6 +3,7 @@ RFCs {#rfcs}
 
 * @subpage eventbased
 * @subpage httpserver
+* @subpage httpserverrest
 * @subpage Sessions
 * @subpage landingpage
 * @subpage restapi