brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [2/5] incubator-brooklyn git commit: Merge remote-tracking branch 'upstream/master'
Date Wed, 19 Nov 2014 23:57:25 GMT
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/25e27616
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/25e27616
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/25e27616

Branch: refs/heads/master
Commit: 25e276169b6aaa57f53bcda2f40c0050f4d9a7fc
Parents: 84b86f1 fbfd78f
Author: Hadrian Zbarcea <hadrian@apache.org>
Authored: Wed Nov 19 10:35:56 2014 -0500
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Wed Nov 19 10:35:56 2014 -0500

----------------------------------------------------------------------
 .../entity/rebind/BasicEntityRebindSupport.java |  6 +-
 .../entity/rebind/RebindManagerImpl.java        | 33 ++++++--
 .../BrooklynMementoPersisterToObjectStore.java  |  2 +-
 .../persister/BrooklynPersistenceUtils.java     |  6 +-
 .../persister/RetryingMementoSerializer.java    | 13 ++-
 .../location/basic/SshMachineLocation.java      |  2 +-
 .../ha/HighAvailabilityManagerImpl.java         | 18 ++--
 .../internal/LocalLocationManager.java          |  7 +-
 .../brooklyn/entity/rebind/RebindFeedTest.java  |  4 +-
 .../ha/HighAvailabilityManagerInMemoryTest.java | 86 ++++++++++++++++++++
 .../ha/HighAvailabilityManagerTestFixture.java  |  2 +-
 .../brooklyn/management/ha/HotStandbyTest.java  | 23 ++++++
 .../location/jclouds/JcloudsLocation.java       |  2 +-
 .../rest/resources/CatalogResource.java         | 18 ++--
 14 files changed, 185 insertions(+), 37 deletions(-)
----------------------------------------------------------------------



Mime
View raw message