aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules8
-rw-r--r--patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch6
m---------upstream/fuel0
m---------upstream/fuel-agent0
m---------upstream/fuel-astute0
m---------upstream/fuel-library0
m---------upstream/fuel-mirror0
m---------upstream/fuel-nailgun-agent0
m---------upstream/fuel-plugin-opendaylight0
m---------upstream/fuel-plugin-ovs0
m---------upstream/fuel-web0
m---------upstream/vswitchperf0
m---------upstream/yardstick0
13 files changed, 3 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules
index 5b1bd073..b36db1c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
[submodule "opnfv-fuel"]
path = upstream/fuel
url = https://gerrit.opnfv.org/gerrit/fuel
- branch = master
+ branch = stable/colorado
[submodule "fuel-library"]
path = upstream/fuel-library
url = https://github.com/openstack/fuel-library.git
@@ -33,11 +33,7 @@
[submodule "vswitchperf"]
path = upstream/vswitchperf
url = https://gerrit.opnfv.org/gerrit/vswitchperf.git
- branch = master
-[submodule "yardstick"]
- path = upstream/yardstick
- url = https://gerrit.opnfv.org/gerrit/yardstick.git
- branch = master
+ branch = stable/colorado
[submodule "fuel-astute"]
path = upstream/fuel-astute
url = https://github.com/openstack/fuel-astute.git
diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
index 513d9fc7..7880fdfe 100644
--- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
+++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
@@ -51,7 +51,7 @@ new file mode 100644
index 0000000..1e772f0
--- /dev/null
+++ b/build/armband.mk
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2016 Enea AB and others.
+# Alexandru.Avadanii@enea.com
@@ -100,10 +100,6 @@ index 0000000..1e772f0
+ export VSPERF_REPO := ${ARMBAND_BASE}/upstream/vswitchperf
+ export VSPERF_BRANCH := armband-workbench
+ export VSPERF_CHANGE := HEAD
-+
-+ export YARDSTICK_REPO := ${ARMBAND_BASE}/upstream/yardstick
-+ export YARDSTICK_BRANCH := armband-workbench
-+ export YARDSTICK_CHANGE := HEAD
+endif
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index b38ea4c..624f233 100644
diff --git a/upstream/fuel b/upstream/fuel
-Subproject c71b57140fdbadfb4c1f39bf0e2df99403820dd
+Subproject 08526c7376ee1b155dfb51f164f46f14f4ec6e5
diff --git a/upstream/fuel-agent b/upstream/fuel-agent
-Subproject 8e3a639c503f18ba0dc675aa08102f360cfaa97
+Subproject 2cd6925ce2986b58a3ff1dcade12f55a41bff71
diff --git a/upstream/fuel-astute b/upstream/fuel-astute
-Subproject f0f05f9ddbe1edebee7ab239abab0bfd3b05c24
+Subproject 65309028c2b65cee68bb865f3895ed185922f3b
diff --git a/upstream/fuel-library b/upstream/fuel-library
-Subproject 814fa3d50dbcbd738c44fd566b01bd514fa1837
+Subproject 0744f4b3fb170d98c7ba70160cd9b91064865bd
diff --git a/upstream/fuel-mirror b/upstream/fuel-mirror
-Subproject 4bf3af7a03a7955dd081a89c568e2573fce2289
+Subproject 81246a7ecd95c27b388df8f8954e4fb81a3f06e
diff --git a/upstream/fuel-nailgun-agent b/upstream/fuel-nailgun-agent
-Subproject 8b0ef4e707e6afaae1863978d8b5dc94eb6315b
+Subproject 46fa0db0f8944f9e67699d281d462678aaf4db2
diff --git a/upstream/fuel-plugin-opendaylight b/upstream/fuel-plugin-opendaylight
-Subproject 1c8443ffc64af120337740551307378d1c21535
+Subproject 8cc22c4717d2da338135d854e1d13aac3ef7531
diff --git a/upstream/fuel-plugin-ovs b/upstream/fuel-plugin-ovs
-Subproject bee1b2b540922f0a1439d3b878480da590f506d
+Subproject 2537604061e8f44f45f0fa5c187f448534bf59c
diff --git a/upstream/fuel-web b/upstream/fuel-web
-Subproject 7be513a48fdcffb726f67fc69968d6142c9d3f4
+Subproject d3463ad92df45541fc0107801aef71e73a194ec
diff --git a/upstream/vswitchperf b/upstream/vswitchperf
-Subproject 21c787b5bb7dd4592bc83718756ac670232a834
+Subproject 99e50b9aa86d3bd92d23a32ff34b5f80b9b3e4d
diff --git a/upstream/yardstick b/upstream/yardstick
deleted file mode 160000
-Subproject 27e254c2273e4be503053db882948b8abf53b26