dellcloudedge/barclamp-swift — pull request #10 by galthaus (2012-05-15 19:28:15+00:00)
Title: Merge essex-hack back into development. [18/26]

chef/cookbooks/swift/recipes/default.rb | 2 +-
chef/cookbooks/swift/recipes/monitor.rb | 7 +++++--
chef/cookbooks/swift/recipes/proxy.rb | 14 +++++++++-----
chef/cookbooks/swift/recipes/storage.rb | 19 +++++++++++++++++--
.../templates/default/account-server-conf.erb | 2 +-
.../templates/default/container-server-conf.erb | 2 +-
.../swift/templates/default/object-server-conf.erb | 2 +-
.../swift/templates/default/swift_nrpe.cfg.erb | 2 +-
crowbar.yml | 4 ----
9 files changed, 36 insertions(+), 18 deletions(-)