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 <robert.varga@pantheon.tech>

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 4d3cbc477beb33dec9e885b2ed4dffba65389ef0..ee70447cb9471d8396e3b5b82428ec18ecea495b 100644 (file)
--- 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 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 a2c51171e443821e915cb917f9f1100fed3bd935..53ee0d07fc9704519b435cda5e69bda96f3844c3 100644 (file)
--- 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 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() {
 
 
     private DataStoreVersions() {