Merge commit '2.7.1' into upstreamupstream/2.7.1

3 files changed, 5 insertions, 3 deletions

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
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