diff options
| author | Michael Stahnke <stahnma@puppetlabs.com> | 2011-06-22 15:32:09 -0700 |
|---|---|---|
| committer | Michael Stahnke <stahnma@puppetlabs.com> | 2011-06-22 15:32:09 -0700 |
| commit | cb23e5a7207ee2aa13cb4fb7ba70e6d6207fbc40 (patch) | |
| tree | 0b5206370ec9355b2b4096f0fde7386a71ca1deb /lib | |
| parent | 6ae3538a58eaa116762141759a88e0e9ad964ebb (diff) | |
| parent | a23e39165a9509a9fa40370929a50fcd1709f4a2 (diff) | |
Merging up 2.7.1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/interface/option.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index bcac94d45..c895da921 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -24,7 +24,7 @@ require 'puppet/util/run_mode' # it's also a place to find top-level commands like 'debug' module Puppet - PUPPETVERSION = '2.7.0' + PUPPETVERSION = '2.7.1' def Puppet.version PUPPETVERSION diff --git a/lib/puppet/interface/option.rb b/lib/puppet/interface/option.rb index b68bdeb12..3cd930acf 100644 --- a/lib/puppet/interface/option.rb +++ b/lib/puppet/interface/option.rb @@ -2,8 +2,6 @@ require 'puppet/interface' class Puppet::Interface::Option include Puppet::Interface::TinyDocs - # For compatibility, deprecated, and should go fairly soon... - ['', '='].each { |x| alias :"desc#{x}" :"description#{x}" } def initialize(parent, *declaration, &block) @parent = parent |