Merge branch '3.x' into 4.x

This commit is contained in:
Adrien Thebo 2014-03-25 13:26:00 -07:00
commit bc14381573

View file

@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
end
group :development, :test do
gem 'rake', :require => false
gem 'rake', '~> 10.1.0', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'rspec-system', :require => false