diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-30 19:00:08 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-01 15:26:51 +0200 |
commit | 81831bb89005e74bfffbcadda50fb1c856d35f17 (patch) | |
tree | 50d86daecb37e66da5d4fc7df86ca4e9f10d6b14 /patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch | |
parent | e37f3d704fa7ab4bd824e3533e6c9fb04862cd47 (diff) |
Rebase: Deal with upstream ODL Boron + OVS bump.
Change-Id: Iea330d6d778ff5034e1e801d20fa74485e302a95
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch')
-rw-r--r-- | patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch b/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch deleted file mode 100644 index 79825128..00000000 --- a/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Tue, 28 Jun 2016 19:06:57 +0200 -Subject: [PATCH] yardstick plugin: Allow overriding git info. - ---- - build/f_isoroot/f_yardstick-pluginbuild/config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk -index 36df8f1..f671aa9 100644 ---- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk -+++ b/build/f_isoroot/f_yardstick-pluginbuild/config.mk -@@ -8,6 +8,6 @@ - # http://www.apache.org/licenses/LICENSE-2.0 - ############################################################################## - --YARDSTICK_BRANCH=675eef731a098f83aa98c2021b151b7e5ba1da7d --YARDSTICK_REPO=https://gerrit.opnfv.org/gerrit/yardstick.git --YARDSTICK_CHANGE= -+YARDSTICK_BRANCH?=675eef731a098f83aa98c2021b151b7e5ba1da7d -+YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git -+YARDSTICK_CHANGE?= |