dellcloudedge/barclamp-nagios — pull request #37 by galthaus (2012-08-25 04:16:36+00:00)
Title: Merge rails3anddb into development [21/29]

crowbar.yml | 11 +---
.../app/controllers/nagios_controller.rb | 4 -
crowbar_framework/app/models/nagios_service.rb | 72 +++++++++-----------
crowbar_framework/config/locales/nagios/en.yml | 21 ++++++
.../20120801015041_barclamp_import_nagios.rb | 24 +++++++
.../doc/default/nagios/barclamp-info.md | 5 ++
crowbar_framework/doc/default/nagios/licenses.md | 10 +++
crowbar_framework/doc/nagios.yml | 11 +++
8 files changed, 103 insertions(+), 55 deletions(-)