You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2021/08/12 20:16:13 UTC
[geode] branch support/1.13 updated: GEODE-9480: Changing the
version with ordinal 121 to be 1.13.2
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 763493d GEODE-9480: Changing the version with ordinal 121 to be 1.13.2
763493d is described below
commit 763493ddd9db97d2d0030c28764e9c1e3fd1fd07
Author: Dan Smith <da...@vmware.com>
AuthorDate: Thu Aug 12 13:15:04 2021 -0700
GEODE-9480: Changing the version with ordinal 121 to be 1.13.2
This protocol change actually happened in 1.13.2. 1.13.1 is still using the
same protocol ordinal as 1.13.0, which is 120.
Evidence
* b2d205459bf is the commit that introduced this version in support/1.13
* b2d205459bf is only contained in rel/v1.13.2 and above
* Running geode 1.13.1, it reports it's protocol version as 120.
(cherry picked from commit 2a90a583015352c1cc0f041008ec2a6ea7b5505c)
---
.../geode/internal/cache/tier/sockets/CommandInitializer.java | 2 +-
.../java/org/apache/geode/internal/serialization/Version.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index 5a66838..ad57a58 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -340,7 +340,7 @@ public class CommandInitializer {
allCommands.put(Version.GEODE_1_12_0, geode18Commands);
allCommands.put(Version.GEODE_1_12_1, geode18Commands);
allCommands.put(Version.GEODE_1_13_0, geode18Commands);
- allCommands.put(Version.GEODE_1_13_1, geode18Commands);
+ allCommands.put(Version.GEODE_1_13_2, geode18Commands);
return Collections.unmodifiableMap(allCommands);
}
diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java
index ea8f462..812ef40 100644
--- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java
+++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java
@@ -289,11 +289,11 @@ public class Version extends VersionOrdinalImpl {
public static final Version GEODE_1_13_0 =
new Version("GEODE", "1.13.0", (byte) 1, (byte) 13, (byte) 0, (byte) 0, GEODE_1_13_0_ORDINAL);
- private static final short GEODE_1_13_1_ORDINAL = 121;
+ private static final short GEODE_1_13_2_ORDINAL = 121;
@Immutable
- public static final Version GEODE_1_13_1 =
- new Version("GEODE", "1.13.1", (byte) 1, (byte) 13, (byte) 1, (byte) 0, GEODE_1_13_1_ORDINAL);
+ public static final Version GEODE_1_13_2 =
+ new Version("GEODE", "1.13.2", (byte) 1, (byte) 13, (byte) 1, (byte) 0, GEODE_1_13_2_ORDINAL);
/* NOTE: when adding a new version bump the ordinal by 5. Ordinals can be short ints */
@@ -304,7 +304,7 @@ public class Version extends VersionOrdinalImpl {
* HIGHEST_VERSION when changing CURRENT !!!
*/
@Immutable
- public static final Version CURRENT = GEODE_1_13_1;
+ public static final Version CURRENT = GEODE_1_13_2;
/**
* A lot of versioning code needs access to the current version's ordinal