aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2015-10-27 14:04:55 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-10-27 14:04:55 +0000
commitdbc9f2f23a4db272a69a9cc9b39817c5196568c3 (patch)
tree1970b7527b9941d5e5ec817b5bbce1d6e3f72d24
parentae9cc8f51f435295da3a922a5904636ca30d6c73 (diff)
parent13f7cf8e71fd9de81678ffc5c8143615ce26cec9 (diff)
Merge "Fuel 7.0 rebase" into experimental
-rw-r--r--INFO3
-rw-r--r--fuel/TODO5
-rw-r--r--fuel/build/f_isoroot/f_odlpluginbuild/Makefile2
-rw-r--r--onboarding.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/INFO b/INFO
index 251e9ea64..892db0756 100644
--- a/INFO
+++ b/INFO
@@ -6,7 +6,7 @@ Primary Contact: jonas.bjurel@ericsson.com
Project Lead: jonas.bjurel@ericsson.com
Jira Project Name: Fuel based OPNFV installer
Jira Project Prefix: FUEL
-Mailing list tag: [Fuel]
+Mailing list tag: [fuel]
IRC: Server:freenode.net Channel:#opnfv-fuel
Repository: fuel
@@ -18,6 +18,5 @@ szilard.cserey@ericsson.com
mskalski@mirantis.com
ruijing.guo@intel.com
-<<<<<<< HEAD
Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-07-13.59.log.html
Link(s) to approval of additional committers:
diff --git a/fuel/TODO b/fuel/TODO
index e2d1b379c..ba7c6152a 100644
--- a/fuel/TODO
+++ b/fuel/TODO
@@ -1,5 +1,6 @@
#########################################################################
# Contributors/version/date
-# jonas.bjurel@ericsson.com 0.2 2015.04.14
+# jonas.bjurel@ericsson.com 1. 2015.10.8
#########################################################################
-Following items needs to be done to achieve an OPNFV/BGS ARNO Fuel Stack:
+Following items needs to be done to achieve an Brahmaputra SR0 Fuel@OPNFV Stack:
+Please see: https://jira.opnfv.org/secure/RapidBoard.jspa?rapidView=41&view=detail
diff --git a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile
index bc925e087..5b10de9b2 100644
--- a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -9,7 +9,7 @@
TOP := $(shell pwd)
ODL_BRANCH=juno/lithium-sr1
-ODL_REPO="https://github.com/stackforge/fuel-plugin-opendaylight.git"
+ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
.PHONY: all
all: .odlbuild
diff --git a/onboarding.txt b/onboarding.txt
index a6a7fcc1c..e98f426c1 100644
--- a/onboarding.txt
+++ b/onboarding.txt
@@ -5,4 +5,4 @@ Full Name:
IRC Nick:
Linux Foundation ID:
Favourite Open Source project:
-How would you like to help with this project:
+How would you like to help this project: