CELIX-237: Merge branch 'develop' into ffi
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/9937ce13 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/9937ce13 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/9937ce13 Branch: refs/heads/develop Commit: 9937ce132caabdfa4e2de27f13558258d5c584f7 Parents: b6f2ae4 e0a5195 Author: Pepijn Noltes <[email protected]> Authored: Tue Sep 1 16:37:41 2015 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Tue Sep 1 16:37:41 2015 +0200 ---------------------------------------------------------------------- .gitignore | 1 + CMakeLists.txt | 3 +- dependency_manager_2/CMakeLists.txt | 2 +- deployment_admin/CMakeLists.txt | 2 +- deployment_admin/private/src/deployment_admin.c | 9 +- log_service/CMakeLists.txt | 2 +- log_writer/CMakeLists.txt | 2 +- .../private/src/endpoint_discovery_poller.c | 72 +++++----- .../discovery_configured/CMakeLists.txt | 2 +- remote_services/discovery_etcd/CMakeLists.txt | 2 +- .../discovery_etcd/private/include/etcd.h | 2 +- .../discovery_etcd/private/src/etcd.c | 135 ++++++++++--------- .../discovery_etcd/private/src/etcd_watcher.c | 70 ++++++++-- .../discovery_shm/private/src/shm_watcher.c | 2 +- remote_services/examples/CMakeLists.txt | 2 +- .../remote_service_admin_http/CMakeLists.txt | 2 +- remote_shell/CMakeLists.txt | 4 +- shell/CMakeLists.txt | 2 +- shell_tui/CMakeLists.txt | 2 +- 19 files changed, 200 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/9937ce13/.gitignore ---------------------------------------------------------------------- diff --cc .gitignore index 159da4f,98033a5..f630756 --- a/.gitignore +++ b/.gitignore @@@ -17,7 -17,5 +17,8 @@@ /.project .DS_Store + .idea build +*~ +*.swp +.idea http://git-wip-us.apache.org/repos/asf/celix/blob/9937ce13/CMakeLists.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/9937ce13/remote_services/discovery/private/src/endpoint_discovery_poller.c ----------------------------------------------------------------------
