CELIX-237: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/celix into develop
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2963e3c2 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2963e3c2 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2963e3c2 Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service Commit: 2963e3c286367c19681e834ff261e75eca186aa8 Parents: 75773ba 48558e8 Author: Pepijn Noltes <[email protected]> Authored: Fri Oct 16 13:31:09 2015 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Fri Oct 16 13:31:09 2015 +0200 ---------------------------------------------------------------------- .../private/include/topology_manager.h | 2 + .../topology_manager/private/src/activator.c | 2 +- .../private/src/topology_manager.c | 47 +++++++++++++------- 3 files changed, 33 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
