Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2ACD0200BA6 for ; Mon, 12 Sep 2016 21:30:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 29AF1160AB2; Mon, 12 Sep 2016 19:30:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7822C160AC8 for ; Mon, 12 Sep 2016 21:30:46 +0200 (CEST) Received: (qmail 9155 invoked by uid 500); 12 Sep 2016 19:30:45 -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 9146 invoked by uid 99); 12 Sep 2016 19:30:45 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2016 19:30:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 51A391A72CC for ; Mon, 12 Sep 2016 19:30:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 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=-1.426] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Qht85esSQUyw for ; Mon, 12 Sep 2016 19:30:43 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 824115FBF8 for ; Mon, 12 Sep 2016 19:30:43 +0000 (UTC) Received: (qmail 8944 invoked by uid 99); 12 Sep 2016 19:30:43 -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; Mon, 12 Sep 2016 19:30:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BD6C1EEE1C; Mon, 12 Sep 2016 19:30:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: udo@apache.org To: commits@geode.incubator.apache.org Date: Mon, 12 Sep 2016 19:30:52 -0000 Message-Id: <15bd267a66524416abc1b1e69a4674d6@git.apache.org> In-Reply-To: <93a8db508ded4bba937aa97259a5042a@git.apache.org> References: <93a8db508ded4bba937aa97259a5042a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/11] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-420 archived-at: Mon, 12 Sep 2016 19:30:47 -0000 Merge branch 'develop' into feature/GEODE-420 Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9df6715e Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9df6715e Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9df6715e Branch: refs/heads/feature/GEODE-420 Commit: 9df6715ef8c1225ffe091475a132363a0e2f6b2e Parents: 8ff5e7a 71c863b Author: Udo Kohlmeyer Authored: Tue Sep 13 05:30:23 2016 +1000 Committer: Udo Kohlmeyer Committed: Tue Sep 13 05:30:23 2016 +1000 ---------------------------------------------------------------------- geode-assembly/src/main/dist/bin/gfsh | 7 -- .../gemfire/distributed/DistributedSystem.java | 2 +- .../gemfire/internal/GemFireVersion.java | 2 +- .../internal/GemFireVersionJUnitTest.java | 10 +++ .../internal/cache/DiskRegionJUnitTest.java | 4 +- ...tentColocatedPartitionedRegionDUnitTest.java | 44 +++++++++--- .../asyncqueue/AsyncEventListenerDUnitTest.java | 74 +++++++------------- .../test/dunit/standalone/ProcessManager.java | 1 + .../project/Dependencies.scala | 2 +- gradle/ide.gradle | 11 +-- 10 files changed, 84 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9df6715e/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java ----------------------------------------------------------------------