Permalink
Browse files

Merge branch 'master' into vagrant_upgrade

Re-locked test-kitchen to officially released gem version

Conflicts:
	Gemfile
  • Loading branch information...
2 parents 3996ac1 + 3ad80bc commit 19efc9aa544b68102106a216d13f931b9a42c9a0 @martinisoft committed Mar 28, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 Gemfile
View
@@ -9,6 +9,6 @@ gem 'chef', (ENV['CHEF_VERSION'] || '>= 0.10.10')
group :integration do
gem 'berkshelf', '~> 1.3.1'
- gem 'test-kitchen', :git => 'git://github.com/opscode/test-kitchen.git', :ref => '1.0'
+ gem 'test-kitchen', '~> 1.0.0.alpha.1'
gem 'kitchen-vagrant', '~> 0.7.2'
end

0 comments on commit 19efc9a

Please sign in to comment.