no longer testing against puppet 2.7

xbezdick · Aug 27, 2014 · cf3e1a5 · cf3e1a5
1 parent fc9718e
commit cf3e1a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ rvm:
   - 2.1.1
 env:
   matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
     - PUPPET_GEM_VERSION="~> 3.4.0"
     - PUPPET_GEM_VERSION="~> 3.5.0"
   global:
@@ -26,12 +25,6 @@ env:
         495e61kP5cxcKNVdDJSiUPPK6fNGQ1xX8=
 matrix:
   exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.1.1
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
     - rvm: 2.1.1
       env: PUPPET_GEM_VERSION="~> 3.4.0"
 notifications:

diff --git a/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb b/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
@@ -2,12 +2,8 @@
 Puppet::Type.type(:rabbitmq_exchange).provide(:rabbitmqadmin) do
 
   commands :rabbitmqctl => '/usr/sbin/rabbitmqctl'
-  if Puppet::Util::Package.versioncmp(Puppet.version, '3.0') >= 0
-    has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
-      environment( { 'HOME' => '' })
-    end
-  else
-    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
+  has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
+    environment( { 'HOME' => '' })
   end
   defaultfor :feature => :posix