Merge pull request #105 from inkblot/puppet-4

Update to support puppet 4
This commit is contained in:
Nate Riffe
2016-10-16 07:04:15 -05:00
committed by GitHub
4 changed files with 8 additions and 14 deletions
+2 -3
View File
@@ -1,13 +1,12 @@
language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
env:
- PUPPET_VERSION=3.3.0
- PUPPET_VERSION=3.4.0
- PUPPET_VERSION=3.7.0
- PUPPET_VERSION=3.8.0
- PUPPET_VERSION=4.0.0
- PUPPET_VERSION=4.5.0
gemfile: Gemfile.travis
before_install: 'cp Gemfile Gemfile.travis'
notifications:
-4
View File
@@ -1,4 +0,0 @@
# ex: si ts=2 sw=2 et
:hierarchy:
- osfamily/%{::osfamily}
- common
+4 -4
View File
@@ -2,8 +2,8 @@
version: 4
datadir: data
hierarchy:
- name: "OS family"
backend: yaml
path: "osfamily/%{facts.os.family}"
- name: "common"
- name: "Platform"
backend: yaml
paths:
- "osfamily/%{facts.os.family}"
- "common"
+2 -3
View File
@@ -1,6 +1,6 @@
{
"name": "inkblot/bind",
"version": "6.0.1",
"version": "7.0.0",
"author": "inkblot",
"license": "Apache-2.0",
"summary": "ISC BIND name server",
@@ -28,8 +28,7 @@
],
"dependencies": [
{ "name": "puppetlabs/stdlib" },
{ "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" },
{ "name": "ripienaar/module_data", "version_requirement": ">=0.0.3" }
{ "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" }
],
"data_provider": "hiera"
}