Skip to content

Commit

Permalink
Merge pull request #12 from rightscale-cookbooks/st_14_14_acu183543_b…
Browse files Browse the repository at this point in the history
…ump_version

Prep for patch version bump
  • Loading branch information
douglaswth committed Oct 14, 2014
2 parents 2afe658 + d0ffdb5 commit c48939f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ gem 'berkshelf'
gem 'thor-foodcritic'

group :integration do
gem 'test-kitchen', '~> 1.1.0'
gem 'test-kitchen', '~> 1.2.1'
gem 'kitchen-vagrant'
gem 'strainer', '~> 3.3.0'
gem 'chefspec', '~> 3.1.0'
gem 'chefspec', '~> 3.4.0'
gem 'travis-lint'
end
2 changes: 1 addition & 1 deletion Strainerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
knife: bundle exec knife cookbook test $COOKBOOK
foodcritic: bundle exec foodcritic -f any $SANDBOX/$COOKBOOK
kitchen: bundle exec kitchen test --parallel
kitchen: bundle exec kitchen test --concurrency=4
4 changes: 2 additions & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
license 'Apache 2.0'
description 'Installs/Configures rs-lamp'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '1.1.0'
version '1.1.1'

depends 'marker', '~> 1.0.0'
depends 'marker', '~> 1.0.1'
depends 'rs-mysql'
depends 'rs-application_php'

Expand Down

0 comments on commit c48939f

Please sign in to comment.