diff options
| author | Adrien Thebo <git@somethingsinistral.net> | 2014-03-25 13:26:00 -0700 | 
|---|---|---|
| committer | Adrien Thebo <git@somethingsinistral.net> | 2014-03-25 13:26:00 -0700 | 
| commit | bc143815739f365f6d8b44a931a6d569d6815ed0 (patch) | |
| tree | c7059895b4a44a93aa1e63f180c15bea0187bacb | |
| parent | aedb89d91fe6737b3ed7acc0aa72c9a2fa56cd45 (diff) | |
| parent | fba67a11781c99f13713813384c88ae5d5c19a00 (diff) | |
| download | puppet-stdlib-bc143815739f365f6d8b44a931a6d569d6815ed0.tar.gz puppet-stdlib-bc143815739f365f6d8b44a931a6d569d6815ed0.tar.bz2  | |
Merge branch '3.x' into 4.x
| -rw-r--r-- | Gemfile | 2 | 
1 files changed, 1 insertions, 1 deletions
@@ -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  | 
