Skip to content

Commit

Permalink
Release 4.1.0
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
blkperl committed Aug 6, 2015
1 parent 708a1da commit 1b01579
Show file tree
Hide file tree
Showing 6 changed files with 245 additions and 80 deletions.
24 changes: 16 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,29 @@
sudo: false
language: ruby
bundler_args: --without system_tests
before_install: rm Gemfile.lock || true
script:
- 'puppet --version'
- 'bundle exec rake validate'
- 'bundle exec rake lint'
- "bundle exec rake spec SPEC_OPTS='--format documentation'"
- 'bundle exec rake test'
matrix:
fast_finish: true
include:
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes"
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes"
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 2.2.0
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
notifications:
email: false
deploy:
provider: puppetforge
user: puppet
password:
secure: "FAK3Izs5bSZyblGvcFnGWm0exZV5+v9pbwfRDD2oihWxX3U3pArGW+3XcwcJfLQgrUYBsOTmHC8yPjlgTBYeIt/5pvg9X+3jwNgeto6kozpI/nvAq4NtcHhzxRejuPELhFYeXZ3hEw0w+v/ZRo2cNLwI0LLpiWEDvCMZN1CJ2RY="
tags: true
# all_branches is required to use tags
all_branches: true
# Only publish if our main Ruby target builds
rvm: 1.9.3
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## 2015-07-26 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)

## 2015-07-26 Release 4.0.0

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

group :development, :unit_tests do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', :require => false
end
source "https://rubygems.org"

group :system_tests do
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
group :test do
gem "rake"
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.0'
gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
gem "puppetlabs_spec_helper"
gem "metadata-json-lint"
gem "rspec-puppet-facts"
gem "rspec"
gem "puppet-blacksmith", "> 3.3.0", :platforms => [:ruby_19, :ruby_20, :ruby_21]
end

if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else
gem 'facter', :require => false
group :development do
gem "travis"
gem "travis-lint"
gem "guard-rake"
end

if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false
else
gem 'puppet', :require => false
group :system_tests do
gem "beaker"
gem "beaker-rspec"
end

# vim:ft=ruby
Loading

0 comments on commit 1b01579

Please sign in to comment.