[geode] branch develop updated: Changing all Version.GEODE_180 to Version_170

[nn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new e78089a  Changing all Version.GEODE_180 to Version_170
e78089a is described below

commit e78089a11f15266df71f57fbd1618961b706573f
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Tue Sep 4 11:16:42 2018 -0700

    Changing all Version.GEODE_180 to Version_170
---
 .../main/java/org/apache/geode/internal/cache/TXCommitMessage.java    | 2 +-
 .../apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java   | 4 ++--
 .../geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
index afee0f2..f55a132 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -927,7 +927,7 @@ public class TXCommitMessage extends PooledDistributionMessage
   }
 
   private boolean hasFlagsField(final Version version) {
-    return version.compareTo(Version.GEODE_180) >= 0;
+    return version.compareTo(Version.GEODE_170) >= 0;
   }
 
   private boolean useShadowKey() {
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 69f0d89..6e3e8a0 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -290,11 +290,11 @@ public class LuceneIndexCommands extends InternalGfshCommand {
 
     // Get members >= Geode 1.8 (when the new destroy code path went into the product)
     Set<DistributedMember> validVersionMembers =
-        getNormalMembersWithSameOrNewerVersion(Version.GEODE_180);
+        getNormalMembersWithSameOrNewerVersion(Version.GEODE_170);
     if (validVersionMembers.isEmpty()) {
       return ResultBuilder.createInfoResult(CliStrings.format(
           LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
-          Version.GEODE_180));
+          Version.GEODE_170));
     }
 
     // Execute the destroy index function
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index 86bc2d3..f4c79f9 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -430,7 +430,7 @@ public class LuceneIndexCommandsJUnitTest {
     final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
     String expectedStatus = CliStrings.format(
         LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
-        new Object[] {Version.GEODE_180}) + LINE_SEPARATOR;
+        new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
     cliFunctionResults.add(new CliFunctionResult("member0", CliFunctionResult.StatusState.OK));
     doReturn(Collections.emptySet()).when(commands).getNormalMembersWithSameOrNewerVersion(any());
     CommandResult result = (CommandResult) commands.destroyIndex("index", "regionPath");
@@ -481,7 +481,7 @@ public class LuceneIndexCommandsJUnitTest {
     final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
     String expectedStatus = CliStrings.format(
         LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
-        new Object[] {Version.GEODE_180}) + LINE_SEPARATOR;
+        new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
     cliFunctionResults.add(new CliFunctionResult("member0", CliFunctionResult.StatusState.OK));
     CommandResult result = (CommandResult) commands.destroyIndex(null, "regionPath");
     verifyDestroyIndexCommandResult(result, cliFunctionResults, expectedStatus);