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

crowbar.yml | 19 +-------
.../app/controllers/keystone_controller.rb | 3 -
crowbar_framework/app/models/keystone_service.rb | 48 +++++++++-----------
crowbar_framework/config/locales/keystone/en.yml | 29 ++++++++++++
.../20120802030000_barclamp_import_keystone.rb | 24 ++++++++++
.../doc/default/keystone/barclamp-info.md | 5 ++
crowbar_framework/doc/default/keystone/licenses.md | 10 ++++
crowbar_framework/doc/keystone.yml | 11 +++++
8 files changed, 102 insertions(+), 47 deletions(-)