Skip to content

Commit 1b01579

Browse files
committed
Release 4.1.0
This module now lives on the puppet community github organization. New features: * Add option to not install collectd-iptables on centos 6 * Allow iptables chains parameter to be an array * Support UdevNameAttr attribute on disk plugin (fixes #300)
1 parent 708a1da commit 1b01579

6 files changed

Lines changed: 245 additions & 80 deletions

File tree

.travis.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,29 @@
22
sudo: false
33
language: ruby
44
bundler_args: --without system_tests
5+
before_install: rm Gemfile.lock || true
56
script:
6-
- 'puppet --version'
7-
- 'bundle exec rake validate'
8-
- 'bundle exec rake lint'
9-
- "bundle exec rake spec SPEC_OPTS='--format documentation'"
7+
- 'bundle exec rake test'
108
matrix:
119
fast_finish: true
1210
include:
1311
- rvm: 1.9.3
14-
env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes"
12+
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
1513
- rvm: 2.1.6
16-
env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes"
14+
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
1715
- rvm: 2.1.6
18-
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
16+
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
1917
- rvm: 2.2.0
20-
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
18+
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
2119
notifications:
2220
email: false
21+
deploy:
22+
provider: puppetforge
23+
user: puppet
24+
password:
25+
secure: "FAK3Izs5bSZyblGvcFnGWm0exZV5+v9pbwfRDD2oihWxX3U3pArGW+3XcwcJfLQgrUYBsOTmHC8yPjlgTBYeIt/5pvg9X+3jwNgeto6kozpI/nvAq4NtcHhzxRejuPELhFYeXZ3hEw0w+v/ZRo2cNLwI0LLpiWEDvCMZN1CJ2RY="
26+
tags: true
27+
# all_branches is required to use tags
28+
all_branches: true
29+
# Only publish if our main Ruby target builds
30+
rvm: 1.9.3

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 2015-07-26 Release 4.1.0
2+
3+
This module now lives on the puppet community github organization.
4+
5+
### New features
6+
7+
* Add option to not install collectd-iptables on centos 6
8+
* Allow iptables chains parameter to be an array
9+
* Support UdevNameAttr attribute on disk plugin (fixes #300)
10+
111
## 2015-07-26 Release 4.0.0
212

313
### Backwards-incompatible changes:

Gemfile

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
1-
source ENV['GEM_SOURCE'] || "https://rubygems.org"
1+
# Copyright 2014 Puppet Community
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
214

3-
group :development, :unit_tests do
4-
gem 'rake', :require => false
5-
gem 'rspec-puppet', :require => false
6-
gem 'puppetlabs_spec_helper', :require => false
7-
gem 'puppet-lint', :require => false
8-
gem 'simplecov', :require => false
9-
gem 'puppet_facts', :require => false
10-
gem 'json', :require => false
11-
gem 'metadata-json-lint', :require => false
12-
end
15+
source "https://rubygems.org"
1316

14-
group :system_tests do
15-
gem 'beaker-rspec', :require => false
16-
gem 'serverspec', :require => false
17+
group :test do
18+
gem "rake"
19+
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.0'
20+
gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
21+
gem "puppetlabs_spec_helper"
22+
gem "metadata-json-lint"
23+
gem "rspec-puppet-facts"
24+
gem "rspec"
25+
gem "puppet-blacksmith", "> 3.3.0", :platforms => [:ruby_19, :ruby_20, :ruby_21]
1726
end
1827

19-
if facterversion = ENV['FACTER_GEM_VERSION']
20-
gem 'facter', facterversion, :require => false
21-
else
22-
gem 'facter', :require => false
28+
group :development do
29+
gem "travis"
30+
gem "travis-lint"
31+
gem "guard-rake"
2332
end
2433

25-
if puppetversion = ENV['PUPPET_GEM_VERSION']
26-
gem 'puppet', puppetversion, :require => false
27-
else
28-
gem 'puppet', :require => false
34+
group :system_tests do
35+
gem "beaker"
36+
gem "beaker-rspec"
2937
end
30-
31-
# vim:ft=ruby

0 commit comments

Comments
 (0)