Update module-collectd to 6a9f949

6a9f949 Merge pull request redhat-openstack#255 from deric/python
7e58baa Implement support for mupltiple Python modules
6343c5b Merge pull request redhat-openstack#260 from dene14/master
9916bbe Added absent timers for statsd module.
e01c6f2 Merge pull request redhat-openstack#259 from deric/meta
6461edb fix license name to follow http://spdx.org/licenses/ conventions
5ffa441 added  metadata-json-lint gem
9dba7e5 Merge pull request redhat-openstack#258 from txaj/testing_on_3_7
e8db403 Merge pull request redhat-openstack#254 from pdxcat/release_3_3_0
e2fe68f Check against puppet 3.7.5
c45093a Merge pull request redhat-openstack#256 from txaj/release_3_3_0_fix
599716b Bump concat fixture version
fe119af Fix tests
5ab404d Pin concat to 1.2.0 in .fixtures.yml
f969049 Release 3.3.0

Puppetfile

@@ -95,7 +95,7 @@ mod 'memcached',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => '1bd511019fe1da9b305b259862aa27516f083be6',
+  :commit => '6a9f9492af6a3a59b74f043ce6bb8227909224b2',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',

module-collectd/.fixtures.yml

@@ -1,6 +1,9 @@
 fixtures:
   repositories:
-    'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib'
-    'concat': 'git://github.com/puppetlabs/puppetlabs-concat'
+    stdlib:
+      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
+    concat:
+      repo: 'git://github.com/puppetlabs/puppetlabs-concat'
+      ref: '1.2.1'
   symlinks:
     'collectd': "#{source_dir}"

module-collectd/.travis.yml

@@ -14,5 +14,9 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
 notifications:
   email: false

module-collectd/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 2015-04-22 Release 3.3.0
+
+### Backwards-incompatible changes:
+
+* Drop Ruby 1.8.7 support
+* Package collectd-python is no longer available in EPEL
+
+### Features:
+
+* Allow disable forwarding in network::server
+
+### Bugs/Maint:
+
+* Fix permission on MySQL plugin file
+* Only set LogSendErrors option if collectd version >= 5.4.
+* CreateFiles/CreateFilesAsync expect boolean values
+
 ## 2015-01-24 Release 3.2.0
 
 ### Backwards-incompatible changes:

module-collectd/Gemfile

@@ -8,6 +8,7 @@ group :development, :unit_tests do
   gem 'simplecov', :require => false
   gem 'puppet_facts', :require => false
   gem 'json', :require => false
+  gem 'metadata-json-lint', :require => false
 end
 
 group :system_tests do