dellcloudedge/barclamp-deployer — pull request #59 by galthaus (2012-08-25 04:16:45+00:00)
Title: Merge rails3anddb into development [24/29]

chef/cookbooks/crowbar-hacks/recipes/default.rb | 2 +-
.../ohai/files/default/plugins/crowbar.rb | 155 +++++++++++-------
config/locales/deployer/en.yml | 22 +++
crowbar.yml | 14 +--
.../app/controllers/deployer_controller.rb | 3 -
crowbar_framework/app/models/deployer_service.rb | 171 +++++++++++---------
.../20120731230005_barclamp_import_deployer.rb | 24 +++
.../doc/default/deployer/barclamp-info.md | 5 +
crowbar_framework/doc/default/deployer/licenses.md | 10 ++
crowbar_framework/doc/deployer.yml | 12 ++
updates/wsman/lib/wsman.rb | 2 +-
11 files changed, 262 insertions(+), 158 deletions(-)