dellcloudedge/barclamp-ntp — pull request #16 by galthaus (2012-08-25 04:15:56+00:00)
Title: Merge rails3anddb into development [14/29]

crowbar.yml | 13 +------
.../app/controllers/ntp_controller.rb | 3 --
crowbar_framework/app/models/ntp_service.rb | 37 +++++++------------
crowbar_framework/config/locales/ntp/en.yml | 21 +++++++++++
.../migrate/20120801015049_barclamp_import_ntp.rb | 24 +++++++++++++
crowbar_framework/doc/default/ntp/barclamp-info.md | 5 +++
crowbar_framework/doc/default/ntp/licenses.md | 10 +++++
crowbar_framework/doc/ntp.yml | 11 ++++++
8 files changed, 86 insertions(+), 38 deletions(-)