Skip to content

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
dhoppe committed Nov 6, 2016
2 parents b5f8102 + c21e047 commit b8287db
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.1.0'
modulesync_config_version: '0.1.1'
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ matrix:
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 1.9.3
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
- rvm: 2.1.9
- rvm: 2.1.10
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 2.1.9
- rvm: 2.1.10
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.2.5
env: PUPPET_VERSION="~> 4.0" CHECK=test
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2016-11-06 Release 1.2.1

### Summary

- [General] Update based on dhoppe/modulesync_config

## 2016-11-05 Release 1.2.0

### Summary
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dhoppe-fail2ban",
"version": "1.2.0",
"version": "1.2.1",
"author": "Dennis Hoppe",
"summary": "This module installs, configures and manages the Fail2ban service.",
"license": "Apache-2.0",
Expand Down
4 changes: 3 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
require 'coveralls'
require 'simplecov'
require 'simplecov-console'

SimpleCov.formatters = [
SimpleCov::Formatter::HTMLFormatter,
SimpleCov::Formatter::Console,
Coveralls::SimpleCov::Formatter
]
SimpleCov.start do
add_filter '/spec'
add_filter 'spec/fixtures'
end
end

Expand All @@ -26,4 +27,5 @@
c.default_facts = default_facts
end


# vim: syntax=ruby

0 comments on commit b8287db

Please sign in to comment.