Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release preparation #211

Merged
merged 1 commit into from
May 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .gitsubprojects
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 3 additions & 1 deletion doc/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog {#Changelog}

# git master
# Release 0.8 (24-05-2017)

* [210](https://github.com/HBPVIS/ZeroEQ/pull/210):
http::Server:
Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions doc/feature/rfcs.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ RFCs {#rfcs}

* @subpage eventbased
* @subpage httpserver
* @subpage httpserverrest
* @subpage Sessions
* @subpage landingpage
* @subpage restapi