diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 22:34:54 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-04 16:04:52 +0000 |
| commit | e7e2d84bec0d404057bce203f9c90231360e88ee (patch) | |
| tree | 43e54e897217da67906580991c3c7f0a110250e8 /patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch | |
| parent | 70f2caa773fc5f0e2b1154a5c095665375f02666 (diff) | |
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
Diffstat (limited to 'patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch')
| -rw-r--r-- | patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch deleted file mode 100644 index cf962502..00000000 --- a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -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 667575c..30d9ccc 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 - |