From a49d5b885a62aa9bd3a686d411739723a67c399c Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Wed, 22 Jun 2011 14:57:03 -0700 Subject: (#8048) Gem install puppet no longer fails if rdoc enabled. Rdoc wouldn't parse lib/puppet/interface/options.rb The offending code has been removed. This was causing issues for users wishing to upgrade puppet, via gem or puppet. Signed-off-by: Michael Stahnke --- lib/puppet/interface/option.rb | 2 -- 1 file changed, 2 deletions(-) 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 -- cgit v1.2.3 From a23e39165a9509a9fa40370929a50fcd1709f4a2 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Wed, 22 Jun 2011 15:25:50 -0700 Subject: Updating for 2.7.1 release. Signed-off-by: Michael Stahnke --- CHANGELOG | 4 ++++ lib/puppet.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e6e7ee5ab..02e86acc9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 -- cgit v1.2.3