summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPieter van de Bruggen <pieter@puppetlabs.com>2011-03-21 11:49:15 -0700
committerPieter van de Bruggen <pieter@puppetlabs.com>2011-03-21 11:49:15 -0700
commit3a22334cc0041b39ce4289e957a0d49e53418560 (patch)
treeb9549ed4d85ecf3dbed8fb8bcdb01a012c0f841d /lib
parent3c3c689fd5749d29b78a88af5855e8f2faf7898a (diff)
parent9c85d70c74d4eab64c5024c3858f30e6fe32dba9 (diff)
downloadpuppet-3a22334cc0041b39ce4289e957a0d49e53418560.tar.gz
puppet-3a22334cc0041b39ce4289e957a0d49e53418560.tar.xz
puppet-3a22334cc0041b39ce4289e957a0d49e53418560.zip
Merge branch 'tickets/master/6785'
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/indirection_base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/indirection_base.rb b/lib/puppet/application/indirection_base.rb
index e6d172ced..764098925 100644
--- a/lib/puppet/application/indirection_base.rb
+++ b/lib/puppet/application/indirection_base.rb
@@ -2,7 +2,7 @@ require 'puppet/application/interface_base'
require 'puppet/interface'
class Puppet::Application::IndirectionBase < Puppet::Application::InterfaceBase
- option("--from TERMINUS", "-f") do |arg|
+ option("--terminus TERMINUS") do |arg|
@from = arg
end