Sync with recent changes in fuel-main 29/7929/3
authorMichal Skalski <mskalski@mirantis.com>
Mon, 25 Jan 2016 20:35:53 +0000 (21:35 +0100)
committerMichal Skalski <mskalski@mirantis.com>
Mon, 25 Jan 2016 23:18:35 +0000 (00:18 +0100)
commit74f53db80b0fb55f4a8d15e88add63f0ef3147ec
treef8ac19188607318aae277a0f8be02f1a804e8673
parent8ce080bcbb40f87c73e040998a83333525fee047
Sync with recent changes in fuel-main

Change-Id: Ife63c8c69e0e17150c198a7a75788a13b8df0d81
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
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