Skip to content

Commit

Permalink
Merge pull request #39 from tobias-urdin/master
Browse files Browse the repository at this point in the history
Update testing, readme and metadata
  • Loading branch information
duritong authored Jul 24, 2018
2 parents 65ffe83 + 50790aa commit 84bf1fc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 26 deletions.
22 changes: 4 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1.0
- 2.2.2
script: 'bundle exec rake'
env:
- PUPPET_VERSION=2.7.25
- PUPPET_VERSION=3.8.1
- PUPPET_VERSION=4.0.0
- PUPPET_VERSION=
- PUPPET_VERSION=3.8.7
- PUPPET_VERSION=4.10.12
- PUPPET_VERSION=5.5.3
matrix:
exclude:
# No support for Ruby 2.0 before Puppet 3.2
- rvm: 2.0.0
env: PUPPET_VERSION=2.7.25
- rvm: 2.1.0
env: PUPPET_VERSION=2.7.25
- rvm: 2.2.2
env: PUPPET_VERSION=2.7.25
# https://tickets.puppetlabs.com/browse/PUP-3796
- rvm: 2.2.2
env: PUPPET_VERSION=3.8.1
# no 1.8.7 support for puppet 4.0
- rvm: 1.8.7
env: PUPPET_VERSION=4.0.0
- rvm: 1.8.7
env: PUPPET_VERSION=
env: PUPPET_VERSION=3.8.7
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ managed like this:

create_resources(sysctl::value,$my_sysctl_settings,$my_sysctl_defaults)

Puppet 3 support
----------------

The 0.0.12 release will be the last version that supports Puppet 3 support.

License
-------

Expand Down
14 changes: 6 additions & 8 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "duritong-sysctl",
"version": "0.0.11",
"version": "0.0.12",
"author": "duritong",
"summary": "This modules allows you to configure sysctl.",
"license": "GPL-2.0",
Expand All @@ -12,7 +12,6 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"4",
"5",
"6",
"7"
Expand All @@ -21,7 +20,6 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"4",
"5",
"6",
"7"
Expand All @@ -30,7 +28,6 @@
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"4",
"5",
"6",
"7"
Expand All @@ -39,7 +36,6 @@
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"4",
"5",
"6",
"7"
Expand All @@ -56,17 +52,19 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"6",
"7",
"8"
"8",
"9",

This comment has been minimized.

Copy link
@mwhahaha

mwhahaha Jul 24, 2018

This is bad, you can't have a tailing comma here

This comment has been minimized.

Copy link
@EmilienM

EmilienM Jul 24, 2018

Contributor

#40

]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"10.04",
"12.04",
"14.04"
"14.04",
"16.04",
"18.04",

This comment has been minimized.

Copy link
@mwhahaha

mwhahaha Jul 24, 2018

Same, the trailing comma is invalid json

]
},
{
Expand Down

0 comments on commit 84bf1fc

Please sign in to comment.