From: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Date: Fri, 23 Dec 2016 21:18:00 +0000 (-0500)
Subject: merge from v1.0
X-Git-Tag: v1.1.0~33
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c33673480c15d6e64402b547563640b2025a3cd6;hp=-c;p=osm%2FSO.git

merge from v1.0

Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
---

c33673480c15d6e64402b547563640b2025a3cd6
diff --combined BUILD.sh
index 18126ad0,345a855f..788f9d14
--- a/BUILD.sh
+++ b/BUILD.sh
@@@ -114,10 -114,10 +114,10 @@@ f
  
  if [[ $PLATFORM == ub16 ]]; then
      PLATFORM_REPOSITORY=${1:-OSM}
-     PLATFORM_VERSION=${2:-4.3.1.0.53651}
+     PLATFORM_VERSION=${2:-4.3.1.0.53704}
  elif [[ $PLATFORM == fc20 ]]; then
      PLATFORM_REPOSITORY=${1:-OSM}  # change to OSM when published
-     PLATFORM_VERSION=${2:-4.3.1.0.53651}
+     PLATFORM_VERSION=${2:-4.3.1.0.53705}
  else
      echo "Internal error: unknown platform $PLATFORM"
      exit 1
@@@ -188,8 -188,6 +188,8 @@@ if [[ $PLATFORM == ub16 ]]; the
  	 rw.core.rwvx-rwdts=${PLATFORM_VERSION} \
  	 rw.automation.core-RWAUTO=${PLATFORM_VERSION} \
           rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION}
 +
 +    sudo apt-get install python-cinderclient
      
      sudo chmod 777 /usr/rift /usr/rift/usr/share