summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2013-07-25 13:49:27 -0700
committerAaron Stone <aaron@serendipity.cx>2013-07-25 13:49:27 -0700
commit45cb7c1319e79cbfb3ff2bcdadfc275260d557e0 (patch)
tree0cb104d45847205a8a6a17138071d34aef597030 /Gemfile
parent164cadc9b9ac25ce70885100f28f8cd649358fa4 (diff)
parent1841d11ee3f885c902a4d41b94beee141a468fa2 (diff)
Merge pull request #85 from sodabrew/travis_puppet_version
Try to get Travis to respect the three different puppet versions
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 9b6706d..e6e114d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
gem 'rake', '~> 0.8.7'
gem 'rspec', '~> 1.3'
gem 'mocha', '~> 0.12.9', :require => false
-gem 'puppet', '~> 2.7'
+gem 'puppet', "~> #{ENV['PUPPET_VERSION'] || '2.7.22'}"