Mesa 1.6.1 to roxy merge - DE1389 - Remove cname_lookup from swift UI [1/2]



 chef/data_bags/crowbar/bc-template-swift.json      |    2 +-
 .../barclamp/swift/_edit_attributes.html.haml      |   17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

Crowbar-Pull-ID: be03f1fa6a2d8050d28c1af75ad0156b1088d070

Crowbar-Release: roxy