diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-24 23:17:57 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-24 23:17:57 -0600 |
| commit | 4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200 (patch) | |
| tree | 431872a6909aab930d4585d1b4b4d730f4bfb703 /lib/puppet/network/client | |
| parent | 7eb09abebb91a567b081a651fce179acfadfb7c0 (diff) | |
| parent | b575d1585322709604f558742dfd6f5ce412b342 (diff) | |
| download | puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.tar.gz puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.tar.xz puppet-4e9c39e6a7ca5ebb9d8343d1e6b835e24c257200.zip | |
Merge branch 'plugins_mount', fixing #891.
Conflicts:
CHANGELOG
Diffstat (limited to 'lib/puppet/network/client')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index 30007d90b..740f01378 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -371,7 +371,6 @@ class Puppet::Network::Client::Master < Puppet::Network::Client # Retrieve facts from the central server. def self.getfacts - # Download the new facts path = Puppet[:factpath].split(":") files = [] |