Merge pull request #112 from intracom-telecom-sdn/release

Release
intracom-telecom-sdn · Mar 1, 2017 · d9f7f76 · d9f7f76
2 parents 7736578 + 1ebe38e
commit d9f7f76
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 347 deletions.
diff --git a/deploy/packer/http/preseed.cfg b/deploy/packer/http/preseed.cfg
diff --git a/deploy/packer/installation.md b/deploy/packer/installation.md
diff --git a/deploy/packer/packer_ubuntu_14_04_server-amd64.json b/deploy/packer/packer_ubuntu_14_04_server-amd64.json
diff --git a/deploy/packer/scripts/projects_provisioner.sh b/deploy/packer/scripts/projects_provisioner.sh
diff --git a/deploy/packer/scripts/update.sh b/deploy/packer/scripts/update.sh
diff --git a/deploy/vagrant/base/Vagrantfile b/deploy/vagrant/base/Vagrantfile
diff --git a/deploy/vagrant/packaged_multi/Vagrantfile b/deploy/vagrant/packaged_multi/Vagrantfile
diff --git a/emulators/sbemu/mtcbench/build.sh b/emulators/sbemu/mtcbench/build.sh
@@ -13,7 +13,7 @@ echo $SCRIPT_DIR
 MT_CBENCH_LOCATION="https://github.com/intracom-telecom-sdn/mtcbench.git"
 
 if [ ! -d $SCRIPT_DIR"/oflops" ] || [ ! -d $SCRIPT_DIR"/openflow" ]; then
-   git clone -b master $MT_CBENCH_LOCATION $SCRIPT_DIR"/mtcbench"
+   git clone -b v.1.0 $MT_CBENCH_LOCATION $SCRIPT_DIR"/mtcbench"
    mv $SCRIPT_DIR"/mtcbench/oflops" $SCRIPT_DIR | mv $SCRIPT_DIR"/mtcbench/openflow" $SCRIPT_DIR | mv $SCRIPT_DIR"/mtcbench/build_mtcbench.sh" $SCRIPT_DIR
    mv $SCRIPT_DIR"/mtcbench/run.sh" $SCRIPT_DIR
    rm -rf $SCRIPT_DIR"/mtcbench"

diff --git a/emulators/sbemu/multinet/build.sh b/emulators/sbemu/multinet/build.sh
@@ -16,7 +16,7 @@ echo $SCRIPT_DIR
 MULTINET_LOCATION="https://github.com/intracom-telecom-sdn/multinet.git"
 
 if [ ! -d $SCRIPT_DIR"/multinet" ]; then
-    git clone -b master $MULTINET_LOCATION $SCRIPT_DIR"/multinet"
+    git clone -b v.1.0 $MULTINET_LOCATION $SCRIPT_DIR"/multinet"
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning multinet failed. Exiting ..."
         exit 1

diff --git a/monitors/oftraf/build.sh b/monitors/oftraf/build.sh
@@ -13,7 +13,7 @@ echo $SCRIPT_DIR
 OFTRAF_LOCATION="https://github.com/intracom-telecom-sdn/oftraf.git"
 
 if [ ! -d $SCRIPT_DIR"/oftraf" ]; then
-    git clone -b master $OFTRAF_LOCATION $SCRIPT_DIR"/oftraf"
+    git clone -b v.1.0 $OFTRAF_LOCATION $SCRIPT_DIR"/oftraf"
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning oftraf failed. Exiting ..."
         exit $?