Merge pull request #350 from cmurphy/master

Remove Puppet 2.7 from travis matrix

diff --git a/.travis.yml b/.travis.yml
index a40ae502e961b7c077a828bf8601c13b8d2fe5fc..66e90e38df88ce1b76267e2716398459b39b88ee 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,7 @@ matrix:
   fast_finish: true
   include:
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0

diff --git a/Gemfile b/Gemfile
index e960f7c4b7855406a5c684d7830c74963ef3e7de..081b1a29159a9c87eac171355e169a2c6833883f 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ group :development, :test do
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
+  gem 'puppet-lint', '0.3.2',    :require => false
   gem 'beaker',                  :require => false
   gem 'beaker-rspec',            :require => false
   gem 'pry',                     :require => false