You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/08/26 23:04:55 UTC
[geode] 05/05: fixed rebase conflict compilation error
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ab7af10f63d691a90694f4cac308230d4653061d
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Mon Aug 26 16:03:03 2019 -0700
fixed rebase conflict compilation error
---
.../org/apache/geode/internal/serialization/SerializationVersion.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
index e066458..9b3addb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
@@ -26,7 +26,7 @@ public class SerializationVersion implements Comparable<SerializationVersion> {
// We need access to them in GMS for backward-compatibility
public static final byte GFE_90_ORDINAL = 45; // this is also GEODE 1.0.0-incubating
public static final byte GEODE_1_2_0_ORDINAL = 65;
- public static final byte GEODE_1_3_0_ORDINAL = 70;
+ public static final byte GEODE_1_4_0_ORDINAL = 75;
public static final byte GEODE_1_10_0_ORDINAL = 105;
/**