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

crowbar.yml | 65 +------------
.../app/controllers/glance_controller.rb | 3 -
crowbar_framework/app/models/glance_service.rb | 101 +++++++++----------
crowbar_framework/config/locales/glance/en.yml | 76 +++++++++++++++
.../20120802041000_barclamp_import_glance.rb | 24 +++++
.../doc/default/glance/barclamp-info.md | 5 +
crowbar_framework/doc/default/glance/licenses.md | 10 ++
crowbar_framework/doc/glance.yml | 11 ++
8 files changed, 176 insertions(+), 119 deletions(-)