Merge "Sync with recent changes in fuel-main"
authorMichal Skalski <mskalski@mirantis.com>
Mon, 25 Jan 2016 23:26:03 +0000 (23:26 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 25 Jan 2016 23:26:03 +0000 (23:26 +0000)
commite4adaf7a29b8e9307b8ac4f4f4c25e021aec84ea
tree73fe41351aac868f288f01cc885106d8c25954bb
parent91257ff4ee78f32081af2e652f58a5ba9e834f61
parent74f53db80b0fb55f4a8d15e88add63f0ef3147ec
Merge "Sync with recent changes in fuel-main"