From commits-return-28461-archive-asf-public=cust-asf.ponee.io@geode.apache.org Thu Sep 27 21:45:45 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0EACB180652 for ; Thu, 27 Sep 2018 21:45:44 +0200 (CEST) Received: (qmail 76430 invoked by uid 500); 27 Sep 2018 19:45:44 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 76417 invoked by uid 99); 27 Sep 2018 19:45:44 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Sep 2018 19:45:44 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 925EB82EF2; Thu, 27 Sep 2018 19:45:43 +0000 (UTC) Date: Thu, 27 Sep 2018 19:45:42 +0000 To: "commits@geode.apache.org" Subject: [geode] branch release/1.7.0 updated: GEODE-3967: Cleaning up of revert issues (#2523) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153807754212.2272.3751285468922084667@gitbox.apache.org> From: nnag@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/release/1.7.0 X-Git-Reftype: branch X-Git-Oldrev: 38dd00103913b40a6f4f395f1e4daa79834b0195 X-Git-Newrev: dd78494ec4caf952065d289ed0f9ddef0c9854ee X-Git-Rev: dd78494ec4caf952065d289ed0f9ddef0c9854ee X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch release/1.7.0 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/release/1.7.0 by this push: new dd78494 GEODE-3967: Cleaning up of revert issues (#2523) dd78494 is described below commit dd78494ec4caf952065d289ed0f9ddef0c9854ee Author: Jason Huynh AuthorDate: Thu Sep 27 11:12:59 2018 -0700 GEODE-3967: Cleaning up of revert issues (#2523) * The revert of previous code was missing test changes due to geode test structure changes. --- .../java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java index c2dc023..166517b 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java @@ -472,7 +472,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT // ARM.updateEntry will be called one more time, so there will be 2 conflicted events assertThat(CCRegion.getCachePerfStats().getConflatedEventsCount()) .describedAs("conflated event count") - .isEqualTo(2); + .isEqualTo(1); } }); } finally {