Merge fixes [1/1]



 chef/cookbooks/ceilometer/recipes/server.rb |  492 +++++++++++++--------------
 1 file changed, 246 insertions(+), 246 deletions(-)

Crowbar-Pull-ID: 442b714fee0308e91bb0b785642125d63f705726

Crowbar-Release: pebbles