commit 3564a7d95c0a2439781cb4b9cab77e1bfcb9357a
author David K. Bainbridge <dbainbri@ciena.com> Thu Nov 02 12:57:35 2017 -0700
committer David K. Bainbridge <dbainbri@ciena.com> Thu Nov 02 13:01:10 2017 -0700
tree f70a2caa86b4a2ca9b846b16fb68415e34746883
parent 3ef821a025ee7025f061a9d01a07b0cf2cbd1de8
parent 8be8384ef55d1e109c2f5d61c41f1f4953377ff2

Merge master into voltha-1.1 and correct version information

Merge commit '8be8384ef55d1e109c2f5d61c41f1f4953377ff2' into HEAD

Change-Id: I77b1db562fd3508c0e9c7b9042af0d9ee8801f69

docker/Dockerfile.onos

diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index 038bcfc..4e9af3a 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -12,7 +12,7 @@
 ADD config/dependencies.xml .
 RUN mvn dependency:copy -Dmdep.useBaseVersion=true -DoutputDirectory=${DOWNLOAD_ROOT} -Dsilent=true -f dependencies.xml
 
-FROM onosproject/onos:1.10.7 as install
+FROM onosproject/onos:1.10.9 as install
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 # The ENV settings must be replicated below as they are not shared between stages
@@ -33,7 +33,7 @@
 RUN ./app-install.sh
 
 # Create the final image coping over the installed applications from the build stage
-FROM onosproject/onos:1.10.7
+FROM onosproject/onos:1.10.9
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 # Install Key Store Options

docker/config/dependencies.xml

diff --git a/docker/config/dependencies.xml b/docker/config/dependencies.xml
index ed4eae2..7b9311e 100644
--- a/docker/config/dependencies.xml
+++ b/docker/config/dependencies.xml
@@ -24,16 +24,13 @@
     <version>fake</version>
 
     <properties>
-        <aaa.version>1.4.0-SNAPSHOT</aaa.version>
-        <config.version>1.4.0-SNAPSHOT</config.version>
-        <dhcpl2relay.version>1.2.0-SNAPSHOT</dhcpl2relay.version>
-        <igmpproxy.version>1.2.0-SNAPSHOT</igmpproxy.version>
-        <mcast.version>1.4.0-SNAPSHOT</mcast.version>
-        <olt.version>1.4.0-SNAPSHOT</olt.version>
-        <sadis.version>1.2.0-SNAPSHOT</sadis.version>
-
-        <!-- TODO onos-build-conf.version can be dropped when onos.version > 1.10.3 -->
-        <onos-build-conf.version>1.10.3-onf</onos-build-conf.version>
+        <aaa.version>1.4.0</aaa.version>
+        <config.version>1.3.1</config.version>
+        <dhcpl2relay.version>1.2.0</dhcpl2relay.version>
+        <igmpproxy.version>1.1.1</igmpproxy.version>
+        <mcast.version>1.3.1</mcast.version>
+        <olt.version>1.3.1</olt.version>
+        <sadis.version>1.1.2</sadis.version>
     </properties>
 
     <build>

install/ansible/roles/installer/tasks/main.yml

diff --git a/install/ansible/roles/installer/tasks/main.yml b/install/ansible/roles/installer/tasks/main.yml
index 52ccaf4..098d17d 100644
--- a/install/ansible/roles/installer/tasks/main.yml
+++ b/install/ansible/roles/installer/tasks/main.yml
@@ -29,6 +29,7 @@
     - install/sort_packages.sh
     - install/sort_packages.py
     - install/install_packages.sh
+    - install/BashLoginTarget.sh
     - install/ansible
     - compose
     - consul_config/basic.json

setup.py

diff --git a/setup.py b/setup.py
index c6dd9d3..da0e32b 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@
 scapy_deps = ['scapy>=2.2.0']
 setup(
     name = 'voltha',
-    version = '1.2.0',
+    version = '1.1.0',
     author = 'Zsolt Haraszti, Nathan Knuth, Ali Al-Shabibi',
     author_email = 'voltha-discuss@opencord.org',
     description = ('Virtual Optical Line Terminal (OLT) Hardware Abstraction'),