From e7e2d84bec0d404057bce203f9c90231360e88ee Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 31 May 2016 22:34:54 +0200 Subject: Rebase: deploy related patch series. After change "common.py: catch stderr in exec_cmd" [1] and other unrelated changes were merged upstream, we need to rebase the complete deploy related series. While we're at it, re-export Fuel@OPNFV patches in Armband. [1] https://gerrit.opnfv.org/gerrit/#/c/14561/ Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a --- .../0016-Allow-customizing-Fuel-commit.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 patches/opnfv-fuel/0016-Allow-customizing-Fuel-commit.patch (limited to 'patches/opnfv-fuel/0016-Allow-customizing-Fuel-commit.patch') diff --git a/patches/opnfv-fuel/0016-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0016-Allow-customizing-Fuel-commit.patch new file mode 100644 index 00000000..b67bd311 --- /dev/null +++ b/patches/opnfv-fuel/0016-Allow-customizing-Fuel-commit.patch @@ -0,0 +1,21 @@ +From: Stanislaw Kardach +Date: Sun, 21 Feb 2016 16:28:02 +0100 +Subject: [PATCH] Allow customizing Fuel commit + +--- + build/config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/config.mk b/build/config.mk +index 23bda18..af63fcd 100644 +--- a/build/config.mk ++++ b/build/config.mk +@@ -9,7 +9,7 @@ + ############################################################################## + + FUEL_MAIN_REPO := https://github.com/openstack/fuel-main +-FUEL_MAIN_TAG = 9.0 ++FUEL_MAIN_TAG := 9.0 + MOS_VERSION = 9.0 + OPENSTACK_VERSION = mitaka-9.0 + -- cgit 1.2.3-korg