From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 30 Jun 2014 19:07:27 +0000 (-0700)
Subject: Merge pull request #323 from cmurphy/master
X-Git-Tag: 1.6.0~15
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=98d16464c32d17e449cc12dd2406654afe81f397;hp=cf54221bd3e2b79474dc6c5cb4d6303f659eccfa;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #323 from cmurphy/master

Update Gemfile for .travis.yml defaults
---

diff --git a/Gemfile b/Gemfile
index 9074f1e..e960f7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,12 @@ group :development, :test do
   gem 'simplecov',               :require => false
 end
 
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else