summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2014-03-25 13:25:31 -0700
committerAdrien Thebo <git@somethingsinistral.net>2014-03-25 13:25:31 -0700
commitfba67a11781c99f13713813384c88ae5d5c19a00 (patch)
tree7da300278f58b09bc6a78d44d1b9d0251fcfbd0d
parent904f1a003e790ba2afaf3452ecda9805e87d80d0 (diff)
parent39339ff31346a4f9d3c6701058b18ee523bf1c4f (diff)
downloadpuppet-stdlib-fba67a11781c99f13713813384c88ae5d5c19a00.tar.gz
puppet-stdlib-fba67a11781c99f13713813384c88ae5d5c19a00.tar.bz2
Merge branch '3.2.x' into 3.x
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 4604d1b..eb5a31c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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