You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/11/18 18:53:18 UTC
[4/5] incubator-brooklyn git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-brooklyn
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-brooklyn
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/22671d0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/22671d0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/22671d0c
Branch: refs/heads/master
Commit: 22671d0c471ea08567d83b16f2fa2ac50d9308b3
Parents: 5ebede9 0f2f632
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 18 17:52:47 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 18 17:52:47 2014 +0000
----------------------------------------------------------------------
.../brooklyn/management/ManagementContext.java | 17 +-
.../brooklyn/config/BrooklynServerConfig.java | 5 -
.../java/brooklyn/entity/basic/Attributes.java | 15 ++
.../java/brooklyn/entity/basic/Entities.java | 2 +-
.../basic/EntityTransientCopyInternal.java | 6 +-
.../entity/group/DynamicMultiGroupImpl.java | 3 +-
.../entity/group/DynamicMultiGroupTest.java | 40 ++-
.../rebind/RebindEntityDynamicTypeInfoTest.java | 5 -
.../entity/rebind/RebindEntityTest.java | 11 +-
.../entity/rebind/RebindFailuresTest.java | 24 +-
.../brooklyn/entity/rebind/RebindFeedTest.java | 6 +-
.../brooklyn/entity/rebind/RebindOptions.java | 92 +++++++
.../entity/rebind/RebindTestFixture.java | 136 +++++-----
.../brooklyn/entity/rebind/RebindTestUtils.java | 249 ++++++++++++++++---
.../transformer/CompoundTransformerTest.java | 8 +-
.../access/PortForwardManagerRebindTest.java | 2 +-
...lusterDatabaseExampleAppIntegrationTest.java | 3 +-
.../entity/pool/ServerPoolRebindTest.java | 3 +-
.../event/feed/jmx/RebindJmxFeedTest.java | 2 +-
.../bind/BindDnsServerIntegrationTest.java | 19 +-
...assandraDatacenterRebindIntegrationTest.java | 3 +-
.../proxy/nginx/NginxRebindIntegrationTest.java | 7 +-
.../JBoss7ServerRebindingIntegrationTest.java | 3 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 3 +-
24 files changed, 487 insertions(+), 177 deletions(-)
----------------------------------------------------------------------