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

crowbar.yml | 11 +------
.../app/controllers/dns_controller.rb | 3 --
crowbar_framework/app/models/dns_service.rb | 32 +++++++-------------
crowbar_framework/config/locales/dns/en.yml | 22 +++++++++++++
.../migrate/20120801015023_barclamp_import_dns.rb | 24 +++++++++++++++
crowbar_framework/doc/default/dns/barclamp-info.md | 5 +++
crowbar_framework/doc/default/dns/licenses.md | 10 ++++++
crowbar_framework/doc/dns.yml | 11 +++++++
8 files changed, 84 insertions(+), 34 deletions(-)