Merge remote-tracking branch 'apache-git/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/76d24ca0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/76d24ca0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/76d24ca0 Branch: refs/heads/master Commit: 76d24ca046ed2b2f38a103a9a2feada01bab776f Parents: b290fdd ad4cfe6 Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 11:59:05 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 11:59:05 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/entity/basic/AbstractEntity.java | 8 +- .../brooklyn/event/basic/ListConfigKey.java | 2 +- .../internal/storage/BrooklynStorage.java | 114 -------- .../brooklyn/internal/storage/DataGrid.java | 52 ---- .../internal/storage/DataGridFactory.java | 38 --- .../brooklyn/internal/storage/Reference.java | 50 ---- .../internal/storage/impl/BackedReference.java | 73 ----- .../internal/storage/impl/BasicReference.java | 67 ----- .../storage/impl/BrooklynStorageImpl.java | 139 --------- .../impl/ConcurrentMapAcceptingNullVals.java | 272 ------------------ .../impl/inmemory/InMemoryDataGridFactory.java | 41 --- .../storage/impl/inmemory/InmemoryDatagrid.java | 93 ------ .../internal/BrooklynFeatureEnablement.java | 2 +- .../core/internal/storage/BrooklynStorage.java | 114 ++++++++ .../core/internal/storage/DataGrid.java | 52 ++++ .../core/internal/storage/DataGridFactory.java | 38 +++ .../core/internal/storage/Reference.java | 50 ++++ .../internal/storage/impl/BackedReference.java | 73 +++++ .../internal/storage/impl/BasicReference.java | 67 +++++ .../storage/impl/BrooklynStorageImpl.java | 139 +++++++++ .../impl/ConcurrentMapAcceptingNullVals.java | 272 ++++++++++++++++++ .../impl/inmemory/InMemoryDataGridFactory.java | 40 +++ .../storage/impl/inmemory/InmemoryDatagrid.java | 93 ++++++ .../internal/AbstractManagementContext.java | 10 +- .../internal/BrooklynGarbageCollector.java | 2 +- .../management/internal/LocalEntityManager.java | 2 +- .../internal/LocalLocationManager.java | 2 +- .../internal/LocalManagementContext.java | 2 +- .../management/internal/LocalUsageManager.java | 2 +- .../internal/ManagementContextInternal.java | 2 +- .../NonDeploymentManagementContext.java | 2 +- .../location/basic/AbstractLocation.java | 8 +- .../storage/impl/BrooklynStorageImplTest.java | 287 ------------------- .../ConcurrentMapAcceptingNullValsTest.java | 114 -------- .../EntityCleanupLongevityTestFixture.java | 6 +- .../storage/impl/BrooklynStorageImplTest.java | 287 +++++++++++++++++++ .../ConcurrentMapAcceptingNullValsTest.java | 115 ++++++++ .../impl/hazelcast/HazelcastDataGrid.java | 3 +- .../hazelcast/HazelcastDataGridFactory.java | 5 +- .../impl/hazelcast/HazelcastStorageTest.java | 8 +- 40 files changed, 1372 insertions(+), 1374 deletions(-) ----------------------------------------------------------------------
