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/20 00:57:27 UTC
[4/5] incubator-brooklyn git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c39720d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c39720d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c39720d3
Branch: refs/heads/master
Commit: c39720d3c5066fc5c7d2162fe366308ca1302591
Parents: f1a3b6b b8bda2e
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Nov 19 17:15:13 2014 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Nov 19 17:15:13 2014 -0500
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 3 +-
.../brooklyn/entity/rebind/RebindManager.java | 4 +-
.../catalog/internal/BasicBrooklynCatalog.java | 23 ++--
.../brooklyn/catalog/internal/CatalogDo.java | 9 +-
.../brooklyn/catalog/internal/CatalogUtils.java | 39 +++++-
.../brooklyn/config/BrooklynServerConfig.java | 1 -
.../entity/basic/ServiceStateLogic.java | 8 +-
.../entity/rebind/RebindManagerImpl.java | 6 +-
.../JavaBrooklynClassLoadingContext.java | 20 +++-
.../OsgiBrooklynClassLoadingContext.java | 36 ++++--
.../management/entitlement/Entitlements.java | 31 +++--
.../ha/HighAvailabilityManagerImpl.java | 87 ++++++++------
...ntPlaneSyncRecordPersisterToObjectStore.java | 2 +-
.../internal/AbstractManagementContext.java | 4 +-
.../internal/BrooklynGarbageCollector.java | 1 +
.../internal/EntityManagementUtils.java | 5 +-
.../management/internal/LocalEntityManager.java | 12 +-
.../main/java/brooklyn/util/ResourceUtils.java | 34 +++---
.../HighAvailabilityManagerSplitBrainTest.java | 15 ++-
.../brooklyn/management/ha/HotStandbyTest.java | 6 +-
.../brooklyn/management/ha/WarmStandbyTest.java | 2 +-
.../JcloudsBlobStoreBasedObjectStore.java | 6 +-
.../JcloudsBlobStoreBasedObjectStoreTest.java | 119 +++++++++++++++++++
.../entity/basic/SoftwareProcessImpl.java | 56 +++++++--
.../java/brooklyn/entity/java/JmxSupport.java | 10 ++
.../main/java/brooklyn/entity/java/UsesJmx.java | 13 +-
.../entity/database/mysql/MySqlNodeImpl.java | 2 +-
.../entity/webapp/jboss/JBoss7ServerImpl.java | 2 -
.../BrooklynComponentTemplateResolver.java | 32 ++++-
.../spi/creation/BrooklynEntityMatcher.java | 4 +-
.../BrooklynYamlTypeInstantiatorTest.java | 2 +-
.../src/test/resources/test-tomcat-https.yaml | 1 -
.../assets/js/view/application-add-wizard.js | 79 +++++++-----
.../main/java/brooklyn/util/text/Strings.java | 2 +-
34 files changed, 499 insertions(+), 177 deletions(-)
----------------------------------------------------------------------