Merge "Updated berkshelf to 3.1.5"

This commit is contained in:
Jenkins 2014-08-18 16:29:45 +00:00 committed by Gerrit Code Review
commit 2ea0234b1f
4 changed files with 5 additions and 2 deletions

View File

@ -1 +1,3 @@
source "https://supermarket.getchef.com"
metadata

View File

@ -6,6 +6,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
## 10.0.0
* Upgrading to Juno
* Upgrading berkshelf from 2.0.18 to 3.1.5
## 9.7.0
* Add new network_uuid cli library method for obtaining ID from various neutron resources

View File

@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem 'chef', '~> 11.12.0'
gem 'json', '<= 1.7.7' # chef 11 dependency
gem 'berkshelf', '~> 2.0.18'
gem 'berkshelf', '~> 3.1.5'
gem 'hashie', '~> 2.0'
gem 'chefspec', '~> 4.0.0'
gem 'rspec', '~> 3.0.0'

View File

@ -11,7 +11,7 @@ To run all of the tests with Strainer:
Or you may run the tests individually:
$ bundle install --path=.bundle # install gem dependencies
$ bundle exec berks install --path=.cookbooks # install cookbook dependencies
$ bundle exec berks vendor .cookbooks # install cookbook dependencies and create the folder .cookbooks
$ bundle exec strainer test -s Strainerfile # run tests
## Rubocop ##