Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d5179358 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d5179358 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d5179358 Branch: refs/heads/master Commit: d517935858187aa7a288b9678a80eec355d56f27 Parents: d350453 f6ad118 Author: Duncan Grant <duncan.gr...@cloudsoft.io> Authored: Wed Sep 12 15:24:50 2018 +0100 Committer: Duncan Grant <duncan.gr...@cloudsoft.io> Committed: Wed Sep 12 15:24:50 2018 +0100 ---------------------------------------------------------------------- .../spi/dsl/BrooklynDslDeferredSupplier.java | 3 +- .../brooklyn/spi/dsl/methods/DslComponent.java | 12 +- .../camp/brooklyn/spi/dsl/DslYamlTest.java | 61 +++++++ .../brooklyn/core/entity/AbstractEntity.java | 2 +- .../mgmt/internal/EntityManagerInternal.java | 8 + .../core/mgmt/internal/LocalEntityManager.java | 43 +++++ .../internal/NonDeploymentEntityManager.java | 6 +- .../core/objs/AbstractEntityAdjunct.java | 2 + .../core/objs/proxy/InternalEntityFactory.java | 15 +- .../brooklyn/core/policy/AbstractPolicy.java | 4 +- .../core/entity/proxying/EntityManagerTest.java | 27 ++++ .../brooklyn/core/mgmt/DeployFailureTest.java | 162 +++++++++++++++++++ .../autoscaling/AutoScalerPolicyRebindTest.java | 3 +- 13 files changed, 333 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
