From: Michal Skalski Date: Mon, 25 Jan 2016 23:26:03 +0000 (+0000) Subject: Merge "Sync with recent changes in fuel-main" X-Git-Tag: colorado.1.rc1~258 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e4adaf7a29b8e9307b8ac4f4f4c25e021aec84ea;p=fuel.git Merge "Sync with recent changes in fuel-main" --- e4adaf7a29b8e9307b8ac4f4f4c25e021aec84ea