Merge remote-tracking branch 'origin/feature/GEODE-409' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6b1c780b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6b1c780b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6b1c780b Branch: refs/heads/feature/GEODE-409 Commit: 6b1c780b3f79ce1822cf59a34f10360bc4f649b7 Parents: 60d3f00 ee4cc01 Author: Darrel Schneider <[email protected]> Authored: Tue Nov 3 11:37:00 2015 -0800 Committer: Darrel Schneider <[email protected]> Committed: Tue Nov 3 11:37:00 2015 -0800 ---------------------------------------------------------------------- .../gemfire/distributed/LocatorLauncher.java | 2 +- .../gemfire/distributed/ServerLauncher.java | 2 +- .../gemfire/distributed/internal/DSClock.java | 2 +- .../internal/DistributionManager.java | 42 ++++++---- .../gemfire/internal/cache/LocalRegion.java | 5 +- .../cache/control/OffHeapMemoryMonitor.java | 25 ++++-- .../offheap/SimpleMemoryAllocatorImpl.java | 2 +- .../java/batterytest/greplogs/LogConsumer.java | 45 +++++------ .../MemoryThresholdsOffHeapDUnitTest.java | 16 ++-- .../gemstone/gemfire/cache30/CacheTestCase.java | 10 +++ .../DistributedNoAckRegionCCEDUnitTest.java | 2 +- .../gemfire/cache30/MultiVMRegionTestCase.java | 37 ++++++++- .../cache30/RegionReliabilityTestCase.java | 84 ++++++++++++-------- .../disttx/DistTXPersistentDebugDUnitTest.java | 21 ----- .../internal/cache/GIIDeltaDUnitTest.java | 2 + .../cache/OffHeapEvictionDUnitTest.java | 2 +- ...rtitionedRegionOffHeapEvictionDUnitTest.java | 4 +- .../PartitionedRegionSingleHopDUnitTest.java | 16 +++- .../cache/RemoteTransactionDUnitTest.java | 1 - .../control/MemoryMonitorOffHeapJUnitTest.java | 2 +- .../control/RebalanceOperationDUnitTest.java | 8 +- ...gionFunctionExecutionSingleHopDUnitTest.java | 2 + .../PersistentPartitionedRegionDUnitTest.java | 1 + .../cache/tier/sockets/Bug36995DUnitTest.java | 2 + .../cache/tier/sockets/Bug37210DUnitTest.java | 22 +++-- .../tier/sockets/ClientServerMiscDUnitTest.java | 2 + .../tier/sockets/HAInterestPart1DUnitTest.java | 1 + .../CompressionRegionConfigDUnitTest.java | 1 + .../internal/lang/ThreadUtilsJUnitTest.java | 37 ++++----- .../management/ClientHealthStatsDUnitTest.java | 2 +- .../management/OffHeapManagementDUnitTest.java | 16 ++-- .../src/test/java/dunit/standalone/ChildVM.java | 4 +- .../java/dunit/standalone/DUnitLauncher.java | 4 +- .../gemfire/cache/util/AutoBalancer.java | 14 ++++ .../util/AutoBalancerIntegrationJUnitTest.java | 5 ++ .../cache/util/AutoBalancerJUnitTest.java | 39 +++++++++ 36 files changed, 320 insertions(+), 162 deletions(-) ----------------------------------------------------------------------
