From 1710d6e45dad125fa3d13a774f2a1afb8749a91f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 25 Sep 2019 16:16:22 +0200 Subject: [PATCH] Switch ABIVersion/DataStoreVersions back to Neon SR2 This switches the current versions for use back to Neon SR2, reverting the rollout. JIRA: CONTROLLER-1919 Change-Id: I57175fb26a86a1de589602bcec3b4c022ddf8a72 Signed-off-by: Robert Varga --- .../org/opendaylight/controller/cluster/access/ABIVersion.java | 2 +- .../controller/cluster/datastore/DataStoreVersions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java index 4d3cbc477b..ee70447cb9 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java @@ -107,7 +107,7 @@ public enum ABIVersion implements WritableObject { * @return Current {@link ABIVersion} */ public static @NonNull ABIVersion current() { - return SODIUM_SR1; + return NEON_SR2; } /** diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java index a2c51171e4..53ee0d07fc 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java @@ -21,7 +21,7 @@ public final class DataStoreVersions { public static final short FLUORINE_VERSION = 9; public static final short NEON_SR2_VERSION = 10; public static final short SODIUM_SR1_VERSION = 11; - public static final short CURRENT_VERSION = SODIUM_SR1_VERSION; + public static final short CURRENT_VERSION = NEON_SR2_VERSION; private DataStoreVersions() { -- 2.36.6