dellcloudedge/barclamp-provisioner — pull request #70 by galthaus (2012-08-25 04:15:45+00:00)
Title: Merge rails3anddb into development [10/29]

crowbar.yml | 11 +---
.../app/controllers/provisioner_controller.rb | 5 +-
.../app/models/provisioner_service.rb | 61 ++++++--------------
.../config/locales/provisioner/en.yml | 21 +++++++
.../20120801015057_barclamp_import_provisioner.rb | 24 ++++++++
.../doc/default/provisioner/barclamp-info.md | 5 ++
.../doc/default/provisioner/licenses.md | 10 +++
crowbar_framework/doc/provisioner.yml | 11 ++++
updates/parse_node_data | 2 +-
9 files changed, 93 insertions(+), 57 deletions(-)