diff options
| author | Stig Sandbeck Mathisen <ssm@debian.org> | 2011-06-27 16:50:51 +0200 |
|---|---|---|
| committer | Stig Sandbeck Mathisen <ssm@debian.org> | 2011-06-27 16:50:51 +0200 |
| commit | b7f131da0b235c080a443ff7c9fabba10f492c08 (patch) | |
| tree | 885795ae3aaf1f797c5d13c51bed1da1576c974d | |
| parent | a0e90107c3cad1fec8c9d7da28b4cbebfef7e606 (diff) | |
| parent | a23e39165a9509a9fa40370929a50fcd1709f4a2 (diff) | |
| download | puppet-upstream/2.7.1.tar.gz | |
Merge commit '2.7.1' into upstreamupstream/2.7.1
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/puppet.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/interface/option.rb | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2.7.1 +=== +a49d5b8 (#8048) Gem install puppet no longer fails if rdoc enabled. + 2.7.0 === 1a33bf8 (#7506) Specify supported Ruby versions in README.md diff --git a/lib/puppet.rb b/lib/puppet.rb index e20874b61..054948b7c 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 |