Mesa 1.6 to roxy [1/1]



 README.txt                                         |    4 +-
 .../memcached/definitions/memcached_instance.rb    |    6 +-
 chef/cookbooks/memcached/recipes/default.rb        |   16 +-
 chef/cookbooks/swift/files/default/rsync_xinetd    |   16 --
 chef/cookbooks/swift/files/default/uwsgi.init      |  156 ----------------
 chef/cookbooks/swift/recipes/auth.rb               |    2 +-
 chef/cookbooks/swift/recipes/default.rb            |    2 +-
 chef/cookbooks/swift/recipes/disks.rb              |    6 -
 chef/cookbooks/swift/recipes/dispersion.rb         |   15 +-
 chef/cookbooks/swift/recipes/proxy.rb              |  187 +++++---------------
 chef/cookbooks/swift/recipes/rsync.rb              |   22 +--
 chef/cookbooks/swift/recipes/storage.rb            |    8 +-
 .../swift/templates/default/auth-server.conf.erb   |    2 +-
 .../swift/templates/default/proxy-server.conf.erb  |   17 +-
 .../swift/templates/default/rsyncd.conf.erb        |    8 +-
 .../default/uwsgi-swift-proxy-centos.xml.erb       |   27 ---
 chef/data_bags/crowbar/bc-template-swift.json      |    4 +-
 chef/data_bags/crowbar/bc-template-swift.schema    |    6 +-
 crowbar.yml                                        |   38 +---
 .../barclamp/swift/_edit_attributes.html.haml      |   59 +++---
 smoketest/00-swift-deploy.test                     |    6 +-
 21 files changed, 137 insertions(+), 470 deletions(-)

Crowbar-Pull-ID: 4d9eb503b0a381e313a0d2787d9f31a1ffe5d2ec

Crowbar-Release: roxy