Fuel 7.0 rebase 21/3421/1
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Wed, 7 Oct 2015 09:17:10 +0000 (11:17 +0200)
committerStefan K. Berg <stefan.k.berg@ericsson.com>
Thu, 19 Nov 2015 08:22:47 +0000 (09:22 +0100)
commit2e89570beb607722683514f8ca6740d01bb3305c
treef945a647c9c084282bcd63d2c40ad8e836cec92e
parent27c12b01000ddaa12a57b3383c717fac65417db4
Fuel 7.0 rebase

Initial change for the Fuel 7.0 rebase.

Change-Id: Ifbe1db9c892a94e64abbcfaaf1c98abce0c03dd4
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Conflicts:
fuel/build/config.mk
fuel/build/Makefile
fuel/build/config.mk
fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
fuel/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig
fuel/build/f_isoroot/f_kscfg/ks.cfg
fuel/build/f_isoroot/f_kscfg/ks.cfg.orig
fuel/build/f_isoroot/f_repobuild/Makefile
fuel/build/fuel-main_3.patch [deleted file]