dellcloudedge/barclamp-crowbar — pull request #51 by galthaus (2012-05-10 17:11:43+00:00)
Title: Merge development into essex-hack in prep for merge back to development after current release [3/11]

bin/crowbar_machines | 3 +-
bin/gather_logs.sh | 72 -----------------
chef/cookbooks/crowbar/files/default/crowbar | 3 +
.../app/controllers/machines_controller.rb | 22 +++++-
.../app/controllers/nodes_controller.rb | 82 ++++++++++++--------
crowbar_framework/app/models/node_object.rb | 26 +++++--
crowbar_framework/app/models/service_object.rb | 30 +++----
.../app/views/barclamp/overview.html.haml | 51 ++++++++++++
.../app/views/nodes/actions.html.haml | 71 +++++++++++++++++
crowbar_framework/app/views/nodes/index.html.haml | 28 ++++---
.../app/views/support/index.html.haml | 2 +-
crowbar_framework/config/locales/en.yml | 2 +
crowbar_framework/config/navigation.rb | 4 +-
crowbar_framework/public/crowbar_users_guide.pdf | Bin 1747800 -> 1113370 bytes
14 files changed, 251 insertions(+), 145 deletions(-)