celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ejans...@apache.org
Subject [2/7] celix git commit: Merge branch 'develop' of http://git.apache.org/celix into develop
Date Wed, 13 Jul 2016 06:09:26 GMT
Merge branch 'develop' of http://git.apache.org/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/89ff35c3
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/89ff35c3
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/89ff35c3

Branch: refs/heads/develop
Commit: 89ff35c3a4eed0b44fe716dfdbb08f88eac19b94
Parents: fb9c9ce e628ee4
Author: Ealanrian <erik@jansman.eu>
Authored: Mon Jul 11 10:56:40 2016 +0200
Committer: Ealanrian <erik@jansman.eu>
Committed: Mon Jul 11 10:56:40 2016 +0200

----------------------------------------------------------------------
 NOTICE                                          |  2 +-
 dependency_manager/private/include/dm_event.h   | 12 ++++-----
 .../include/dm_service_dependency_impl.h        |  4 +--
 .../private/src/dm_component_impl.c             | 20 +++++++-------
 dependency_manager/private/src/dm_event.c       | 10 +++----
 .../private/src/dm_service_dependency.c         | 10 +++----
 .../public/include/dm_component.h               |  6 ++---
 .../public/include/dm_service_dependency.h      | 26 +++++++++---------
 .../phase2a/private/include/phase2a_cmp.h       |  2 +-
 .../phase2a/private/src/phase2a_activator.c     |  2 +-
 .../phase2a/private/src/phase2a_cmp.c           |  4 +--
 .../phase2b/private/include/phase2b_cmp.h       |  2 +-
 .../phase2b/private/src/phase2b_activator.c     |  2 +-
 .../phase2b/private/src/phase2b_cmp.c           |  4 +--
 .../phase3/private/include/phase3_cmp.h         |  4 +--
 .../phase3/private/src/phase3_activator.c       |  2 +-
 .../dm_example/phase3/private/src/phase3_cmp.c  | 10 +++----
 .../private/src/listener_example.c              |  4 +--
 .../tracker_depman/private/include/tracker.h    | 18 ++++++-------
 .../private/src/dependency_activator.c          |  2 +-
 .../tracker_depman/private/src/tracker.c        | 26 +++++++++---------
 framework/private/include/framework_private.h   |  4 +--
 .../private/include/service_reference_private.h |  4 +--
 .../include/service_registration_private.h      | 12 ++++-----
 framework/private/mock/bundle_context_mock.c    |  4 +--
 framework/private/mock/framework_mock.c         |  6 ++---
 framework/private/mock/service_reference_mock.c |  4 +--
 .../private/mock/service_registration_mock.c    | 12 ++++-----
 framework/private/mock/service_registry_mock.c  |  6 ++---
 framework/private/mock/version_range_mock.c     |  2 +-
 framework/private/src/bundle_context.c          |  9 ++++---
 framework/private/src/framework.c               | 10 +++----
 framework/private/src/service_reference.c       |  7 +++--
 framework/private/src/service_registration.c    | 28 ++++++++++++--------
 framework/private/src/service_registry.c        | 28 ++++++++++++--------
 .../private/test/service_registration_test.cpp  |  6 ++---
 .../private/test/service_registry_test.cpp      |  2 +-
 framework/public/include/bundle_context.h       |  2 +-
 framework/public/include/service_registry.h     |  4 +--
 .../private/src/endpoint_discovery_poller.c     |  4 +--
 .../topology_manager/private/src/scope.c        |  4 +--
 utils/private/src/array_list.c                  |  4 +--
 utils/private/src/version_range.c               |  2 +-
 utils/public/include/array_list.h               |  2 +-
 utils/public/include/version_range.h            |  2 +-
 45 files changed, 179 insertions(+), 161 deletions(-)
----------------------------------------------------------------------



Mime
View raw message