diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
| commit | a8592f1009040ebf30a98268610915cc33bb3f63 (patch) | |
| tree | 49f61323a8536d58ce332e97b882677f55727df7 /lib/puppet/indirector/node/ldap.rb | |
| parent | e1907798425a7b163ac1b831b0cf11e88985815e (diff) | |
| parent | 491a69682728818e04b8a20a5d8f4f783ad6ddaf (diff) | |
| download | puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.gz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.xz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.zip | |
Merge branch '0.24.x'
Conflicts:
install.rb
lib/puppet/defaults.rb
man/man8/puppet.8
Diffstat (limited to 'lib/puppet/indirector/node/ldap.rb')
| -rw-r--r-- | lib/puppet/indirector/node/ldap.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/indirector/node/ldap.rb b/lib/puppet/indirector/node/ldap.rb index 8537e1cf3..73b5cdd70 100644 --- a/lib/puppet/indirector/node/ldap.rb +++ b/lib/puppet/indirector/node/ldap.rb @@ -7,7 +7,8 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap # The attributes that Puppet class information is stored in. def class_attributes - Puppet[:ldapclassattrs].split(/\s*,\s*/) + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + x = Puppet[:ldapclassattrs].split(/\s*,\s*/) end # Look for our node in ldap. |