Merge pull request redhat-openstack#244 from arioch/fix_travis_depr_ruby

Ruby 1.8.7 is deprecated
xbezdick · Mar 4, 2015 · 59ab73e · 59ab73e
2 parents 1830403 + e41495e
commit 59ab73e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,6 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 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"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0

diff --git a/manifests/plugin/python.pp b/manifests/plugin/python.pp
@@ -11,12 +11,6 @@
 
   validate_hash($config)
 
-  if $::osfamily == 'Redhat' {
-    package { 'collectd-python':
-      ensure => $ensure,
-    }
-  }
-
   $conf_dir = $collectd::params::plugin_conf_dir
 
   # This is deprecated file naming ensuring old style file removed, and should be removed in next major relese