Merge "Sync with recent changes in fuel-main" into stable/brahmaputra
authorStefan Berg <stefan.k.berg@ericsson.com>
Fri, 29 Jan 2016 13:30:28 +0000 (13:30 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 13:30:29 +0000 (13:30 +0000)
commitf32ce90a3a08891ab2253ca910b7025314b0c8d8
tree4d0434c3acb6e7c8d1bb7ce4f3d40fe31911831c
parente9316d44c551390327bb9661ad8d8ed10c28b3ae
parent156c25b5283ca91517b47f72f4381071203dc5eb
Merge "Sync with recent changes in fuel-main" into stable/brahmaputra
build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
build/f_isoroot/f_odlpluginbuild/Makefile