Mesa 1.6.1 to roxy merges 


 chef/cookbooks/mysql/attributes/server.rb          |    4 ++--
 crowbar_framework/app/models/database_service.rb   |   11 +++++------
 .../barclamp/database/_edit_attributes.html.haml   |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

Crowbar-Pull-ID: c2a7e9eb8dbbec3df18a45b4b12b027c7e0e0714

Crowbar-Release: roxy