[geode] branch release/1.7.0 updated: GEODE-3967: Cleaning up of revert issues (#2523)

[nnag]

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 <huyn...@gmail.com>
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 {