Sync with recent changes in fuel-main 25/8525/2
authorMichal Skalski <mskalski@mirantis.com>
Mon, 25 Jan 2016 20:35:53 +0000 (21:35 +0100)
committerStefan Berg <sfb@consultron.com>
Fri, 29 Jan 2016 13:25:56 +0000 (14:25 +0100)
commit156c25b5283ca91517b47f72f4381071203dc5eb
treefa54abb0f4699a3049f5da1eac937a6613934aaf
parent19f52239658b8e8b905acf4e8613db51f8d03e02
Sync with recent changes in fuel-main

Change-Id: Ife63c8c69e0e17150c198a7a75788a13b8df0d81
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit 74f53db80b0fb55f4a8d15e88add63f0ef3147ec)
build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh.orig
build/f_isoroot/f_odlpluginbuild/Makefile