CAN MERGE

VERIFIED
Description: Update of a few information files
JIRA: IMPROVEMENT

Change-Id: I792d4d79b1fda048231819de9be73c3467f3625a
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>

diff --git a/INFO b/INFO
index 251e9ea..892db07 100644 (file)
--- 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 e2d1b37..ba7c615 100644 (file)
--- 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/onboarding.txt b/onboarding.txt
index a6a7fcc..e98f426 100644 (file)
--- 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: