summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRein Henrichs <rein@puppetlabs.com>2010-06-21 17:53:20 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit35636e9984f1f9b2c6fae3d1410b4b08b6311693 (patch)
tree980243c5bb6526845f915bce4a5e4462d569adc0 /lib
parent45ca669671cc2cf4f2f811bbd48b5283d8fa6c8a (diff)
downloadpuppet-35636e9984f1f9b2c6fae3d1410b4b08b6311693.tar.gz
puppet-35636e9984f1f9b2c6fae3d1410b4b08b6311693.tar.xz
puppet-35636e9984f1f9b2c6fae3d1410b4b08b6311693.zip
[#3921] Fix typo "fact_terminus" -> "facts_terminus"
Doh.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/agent.rb2
-rw-r--r--lib/puppet/defaults.rb2
-rwxr-xr-xlib/puppet/node/facts.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index 8353dd89f..39e6ff38c 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -247,7 +247,7 @@ class Puppet::Application::Agent < Puppet::Application
Puppet[:catalog_terminus] = :rest
# Override the default.
- Puppet[:fact_terminus] = :facter
+ Puppet[:facts_terminus] = :facter
Puppet::Resource::Catalog.cache_class = :yaml
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 1e1fc1556..78f4cd52e 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -116,7 +116,7 @@ module Puppet
:node_terminus => ["plain", "Where to find information about nodes."],
:catalog_terminus => ["compiler", "Where to get node catalogs. This is useful to change if, for instance,
you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."],
- :fact_terminus => ["facter", "Where to get node facts."],
+ :facts_terminus => ["facter", "Where to get node facts."],
:httplog => { :default => "$logdir/http.log",
:owner => "root",
:mode => 0640,
diff --git a/lib/puppet/node/facts.rb b/lib/puppet/node/facts.rb
index 7c1a188ec..2b086afea 100755
--- a/lib/puppet/node/facts.rb
+++ b/lib/puppet/node/facts.rb
@@ -16,7 +16,7 @@ class Puppet::Node::Facts
end
end
- indirects :facts, :terminus_setting => :fact_terminus, :extend => NodeExpirer
+ indirects :facts, :terminus_setting => :facts_terminus, :extend => NodeExpirer
attr_accessor :name, :values