Skip to content

Commit 2c5d7ee

Browse files
authored
Merge pull request #50 from puppetlabs/parent_fix
Parent fix
2 parents 717b1c3 + 2dcb2b8 commit 2c5d7ee

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

lib/puppet/type/node_group.rb

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
end
1717
newproperty(:parent) do
1818
desc 'The ID of the parent group'
19-
defaultto '00000000-0000-4000-8000-000000000000'
2019
end
2120
newproperty(:variables) do
2221
desc 'Variables set this group\'s scope'

manifests/params.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
if "$::puppetversion" =~ /3.8/ {
55
$gemprovider='pe_gem'
66
}
7-
elsif "$::pe_server_version" =~ /2015/ {
7+
elsif "$::pe_server_version" =~ /201\d/ {
88
$gemprovider = 'puppet_gem'
99
}
1010
else {

0 commit comments

Comments
 (0)