Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E5E8119FF7 for ; Tue, 15 Mar 2016 18:47:24 +0000 (UTC) Received: (qmail 86969 invoked by uid 500); 15 Mar 2016 18:47:24 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 86939 invoked by uid 500); 15 Mar 2016 18:47:24 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 86930 invoked by uid 99); 15 Mar 2016 18:47:24 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2016 18:47:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 60794C0D23 for ; Tue, 15 Mar 2016 18:47:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id rA-EHNYBVJi1 for ; Tue, 15 Mar 2016 18:47:23 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id B86665FAE2 for ; Tue, 15 Mar 2016 18:47:22 +0000 (UTC) Received: (qmail 86916 invoked by uid 99); 15 Mar 2016 18:47:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2016 18:47:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB81BDFB8A; Tue, 15 Mar 2016 18:47:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Tue, 15 Mar 2016 18:47:24 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Tue Mar 15 11:42:42 2016 -0700 Committer: Kirk Lund 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(-) ----------------------------------------------------------------------