Merge branch 'master' into adjunct-activities-rest-api
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/92b9cc63 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/92b9cc63 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/92b9cc63 Branch: refs/heads/master Commit: 92b9cc638653b53effa20a696e69cb0d9c5c9a9c Parents: cea2d34 a73ee17 Author: Alex Heneveld <[email protected]> Authored: Fri Oct 6 09:08:01 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Oct 6 09:08:01 2017 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/api/mgmt/ExecutionContext.java | 2 +- .../apache/brooklyn/api/mgmt/ManagementContext.java | 3 +++ .../brooklyn/core/config/ConfigConstraints.java | 2 +- .../mgmt/internal/AbstractManagementContext.java | 16 ++++++++++++++++ .../internal/NonDeploymentManagementContext.java | 9 +++++++++ .../core/mgmt/rebind/RebindManagerImpl.java | 3 ++- .../brooklyn/core/objs/AbstractEntityAdjunct.java | 6 +----- .../util/core/task/BasicExecutionManager.java | 5 ++++- .../brooklyn/core/entity/EntityAssertsTest.java | 3 ++- .../mgmt/internal/LocalSubscriptionManagerTest.java | 8 +++----- .../brooklyn/location/jclouds/JcloudsLocation.java | 15 +++++---------- .../main/resources/OSGI-INF/blueprint/service.xml | 2 ++ rest/rest-server/src/main/webapp/WEB-INF/web.xml | 1 + 13 files changed, 50 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
