CELIX_237: Merge remote-tracking branch 'origin/develop' into ffi
Conflicts:
.travis.yml
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/b5d2367d
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/b5d2367d
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/b5d2367d
Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: b5d2367d88b4969cb00eb7a9f40fd09e03cf5bd8
Parents: 1685377 f32a233
Author: Pepijn Noltes <pepijnnol...@gmail.com>
Authored: Tue Aug 18 12:46:11 2015 +0200
Committer: Pepijn Noltes <pepijnnol...@gmail.com>
Committed: Tue Aug 18 12:46:11 2015 +0200
----------------------------------------------------------------------
CMakeLists.txt | 1 +
cmake/CMakeCelix.cmake | 4 +
deployment_admin/private/src/deployment_admin.c | 2 +-
device_access/device_access/CMakeLists.txt | 2 -
device_access/driver_locator/CMakeLists.txt | 2 -
.../example/base_driver/CMakeLists.txt | 2 -
.../base_driver/private/src/base_driver.c | 2 +-
.../example/consuming_driver/CMakeLists.txt | 2 -
.../private/src/consuming_driver.c | 1 +
.../example/refining_driver/CMakeLists.txt | 2 -
examples/CMakeLists.txt | 7 +-
examples/deploy.cmake | 6 +-
framework/private/src/framework.c | 3 +-
.../private/src/endpoint_discovery_server.c | 9 +
.../discovery_configured/CMakeLists.txt | 22 +-
.../remote_service_admin_http/CMakeLists.txt | 6 +-
.../private/src/remote_service_admin_impl.c | 10 +-
.../utils/private/include/civetweb.h | 542 +-
remote_services/utils/private/src/civetweb.c | 14935 +++++++----------
19 files changed, 6574 insertions(+), 8986 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/b5d2367d/CMakeLists.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/b5d2367d/cmake/CMakeCelix.cmake
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/b5d2367d/framework/private/src/framework.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/b5d2367d/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
----------------------------------------------------------------------
