You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/15 19:47:24 UTC
[4/5] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-949-2
Merge remote-tracking branch 'origin/develop' into feature/GEODE-949-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8eab1bb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8eab1bb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8eab1bb9
Branch: refs/heads/feature/GEODE-949-2
Commit: 8eab1bb9c3fc2cb1a57ea4e2e727d71595779851
Parents: 98c122c 22ab270
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Mar 15 11:42:42 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Mar 15 11:42:42 2016 -0700
----------------------------------------------------------------------
.../internal/InternalDistributedSystem.java | 2 +-
.../cache/control/OffHeapMemoryMonitor.java | 45 +++++++--------
.../internal/offheap/FreeListManager.java | 20 +++----
.../internal/offheap/OffHeapStorage.java | 9 ++-
.../OffHeapStoredObjectAddressStack.java | 6 +-
.../offheap/SimpleMemoryAllocatorImpl.java | 47 ++++++---------
.../cache30/ClientMembershipDUnitTest.java | 14 +++--
.../gms/membership/GMSJoinLeaveTestHelper.java | 24 ++++++++
.../internal/offheap/FreeListManagerTest.java | 5 +-
.../offheap/OffHeapHelperJUnitTest.java | 5 +-
.../OffHeapRegionEntryHelperJUnitTest.java | 4 +-
.../offheap/OffHeapStorageJUnitTest.java | 12 ++--
...ffHeapStoredObjectAddressStackJUnitTest.java | 9 +--
.../offheap/OffHeapStoredObjectJUnitTest.java | 4 +-
.../offheap/SimpleMemoryAllocatorJUnitTest.java | 55 +++---------------
.../gemfire/test/dunit/NamedCallable.java | 26 +++++++++
.../gemfire/test/dunit/NamedRunnable.java | 26 +++++++++
.../com/gemstone/gemfire/test/dunit/VM.java | 61 ++++++++++++++++++++
.../test/dunit/tests/BasicDUnitTest.java | 24 ++++++++
19 files changed, 252 insertions(+), 146 deletions(-)
----------------------------------------------------------------------