Merge pull request #626 from domcleal/concat-2

Support puppetlabs-concat 2.x
This commit is contained in:
Hunter Haugen 2015-06-04 10:40:54 -07:00
commit 7a4f013658
2 changed files with 1 additions and 2 deletions

View file

@ -6,6 +6,5 @@ fixtures:
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
file_concat: "https://github.com/electrical/puppet-lib-file_concat.git"
symlinks:
postgresql: "#{source_dir}"

View file

@ -69,6 +69,6 @@
"dependencies": [
{"name":"puppetlabs/stdlib","version_requirement":"4.x"},
{"name":"puppetlabs/apt","version_requirement":">=1.8.0 <2.0.0"},
{"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <2.0.0"}
{"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <3.0.0"}
]
}