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

crowbar.yml | 25 +---------
.../app/controllers/hive_controller.rb | 51 +++++++++----------
crowbar_framework/app/models/hive_service.rb | 39 +++++++--------
crowbar_framework/config/locales/hive/en.yml | 36 ++++++++++++++
.../migrate/20120801015031_barclamp_import_hive.rb | 24 +++++++++
.../doc/default/hive/barclamp-info.md | 5 ++
crowbar_framework/doc/default/hive/licenses.md | 10 ++++
crowbar_framework/doc/hive.yml | 12 +++++
8 files changed, 131 insertions(+), 71 deletions(-)