commit 57ab0e1be7c2b809bc5a2cd3a4c14fed0166d5f6
author Andrea Campanella <andrea@opennetworking.org> Wed Sep 23 18:37:28 2020 +0200
committer Andrea Campanella <andrea@opennetworking.org> Wed Sep 23 18:37:28 2020 +0200
tree 60f5d5d667bf09b214d3140af02fc630ff9b2c15
parent fdfc916703e6b6790c186afd6d9f3c99fd77f376

Using 2.2-latest onos snapshot of olt and snapshot of dhcpl2relay

Change-Id: I8ecbb3bc8c47b11929975fb6f716404e87edf7df

Dockerfile.voltha-onos

diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index ae46d70..ef9bdf2 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,7 +34,7 @@
 
 
 # Unpack and install specific apps from download stage
-FROM onosproject/onos:2.2.4 as install
+FROM onosproject/onos:2.2-latest as install
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
@@ -58,7 +58,7 @@
 
 
 # Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:2.2.4
+FROM onosproject/onos:2.2-latest
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos

VERSION

diff --git a/VERSION b/VERSION
index 561ad33..0211f69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.6
+4.1.6-dev

dependencies.xml

diff --git a/dependencies.xml b/dependencies.xml
index 5cf801a..12d519d 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,10 +24,10 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>4.2.0</olt.version>
+        <olt.version>4.2.1-SNAPSHOT</olt.version>
         <sadis.version>5.1.0</sadis.version>
         <aaa.version>2.1.0</aaa.version>
-        <dhcpl2relay.version>2.2.1</dhcpl2relay.version>
+        <dhcpl2relay.version>2.2.2-SNAPSHOT</dhcpl2relay.version>
         <kafka.version>2.4.0</kafka.version>
         <igmpproxy.version>2.1.2</igmpproxy.version>
         <mcast.version>2.1.0</mcast.version>