Skip to content

Commit 04dca2c

Browse files
committed
Update module-collectd to 6343c5b
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 Change-Id: Ib434a4e0828fbdd3ff4e158692c442c6e6302e68
1 parent 5628e2d commit 04dca2c

17 files changed

+174
-87
lines changed

Puppetfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ mod 'memcached',
9595
:git => 'https://github.com/saz/puppet-memcached.git'
9696

9797
mod 'module-collectd',
98-
:commit => '1bd511019fe1da9b305b259862aa27516f083be6',
98+
:commit => '6343c5bd7975890878ed9716a145ec891b7c76aa',
9999
:git => 'https://github.com/pdxcat/puppet-module-collectd.git'
100100

101101
mod 'module-data',

module-collectd/.fixtures.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
fixtures:
22
repositories:
3-
'stdlib': 'git://github.com/puppetlabs/puppetlabs-stdlib'
4-
'concat': 'git://github.com/puppetlabs/puppetlabs-concat'
3+
stdlib:
4+
repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
5+
concat:
6+
repo: 'git://github.com/puppetlabs/puppetlabs-concat'
7+
ref: '1.2.1'
58
symlinks:
69
'collectd': "#{source_dir}"

module-collectd/.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@ matrix:
1414
env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
1515
- rvm: 2.0.0
1616
env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
17+
- rvm: 1.9.3
18+
env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
19+
- rvm: 2.0.0
20+
env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
1721
notifications:
1822
email: false

module-collectd/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## 2015-04-22 Release 3.3.0
2+
3+
### Backwards-incompatible changes:
4+
5+
* Drop Ruby 1.8.7 support
6+
* Package collectd-python is no longer available in EPEL
7+
8+
### Features:
9+
10+
* Allow disable forwarding in network::server
11+
12+
### Bugs/Maint:
13+
14+
* Fix permission on MySQL plugin file
15+
* Only set LogSendErrors option if collectd version >= 5.4.
16+
* CreateFiles/CreateFilesAsync expect boolean values
17+
118
## 2015-01-24 Release 3.2.0
219

320
### Backwards-incompatible changes:

module-collectd/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ group :development, :unit_tests do
88
gem 'simplecov', :require => false
99
gem 'puppet_facts', :require => false
1010
gem 'json', :require => false
11+
gem 'metadata-json-lint', :require => false
1112
end
1213

1314
group :system_tests do

0 commit comments

Comments
 (0)