Merge branch '2.7.next' into next

* 2.7.next:
  Revert "(#7220) Add the ability to "inherit" options."
  (#7469) Add license to test face so tests pass
  (#7264) Docs: Clarify that subscribe/notify imply require/before
  (#7468) Stub spec that tries to connect to pypi.python.org
  Prevent spec failure caused by network device mock leak
  Fix #7299 - do not require net/ssh for running rake spec

3 files changed, 3 insertions, 16 deletions

diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb
index 114e5341b..622371a4e 100644
--- a/lib/puppet/interface/action.rb
+++ b/lib/puppet/interface/action.rb
@@ -254,11 +254,6 @@ WRAPPER
     option
   end
 
-  def inherit_options_from(action)
-    options = action.options.map { |opt| action.get_option(opt, false) }
-    options.reject!(&:nil?).uniq.each { |option| add_option(option) }
-  end
-
   def option?(name)
     @options_hash.include? name.to_sym
   end
diff --git a/lib/puppet/interface/action_builder.rb b/lib/puppet/interface/action_builder.rb
index ba5531f1d..62db8de06 100644
--- a/lib/puppet/interface/action_builder.rb
+++ b/lib/puppet/interface/action_builder.rb
@@ -31,16 +31,6 @@ class Puppet::Interface::ActionBuilder
     @action.add_option(option)
   end
 
-  def inherit_options_from(action)
-    if action.is_a? Symbol
-      name = action
-      action = @face.get_action(name) or
-      raise ArgumentError, "This Face has no action named #{name}!"
-    end
-
-    @action.inherit_options_from(action)
-  end
-
   def default(value = true)
     @action.default = !!value
   end
diff --git a/lib/puppet/util/network_device/transport/ssh.rb b/lib/puppet/util/network_device/transport/ssh.rb
index bf0e7193c..3d7976543 100644
--- a/lib/puppet/util/network_device/transport/ssh.rb
+++ b/lib/puppet/util/network_device/transport/ssh.rb
@@ -2,7 +2,6 @@
 require 'puppet/util/network_device'
 require 'puppet/util/network_device/transport'
 require 'puppet/util/network_device/transport/base'
-require 'net/ssh'
 
 # This is an adaptation/simplification of gem net-ssh-telnet, which aims to have
 # a sane interface to Net::SSH. Credits goes to net-ssh-telnet authors
@@ -12,6 +11,9 @@ class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice:
 
   def initialize
     super
+    unless Puppet.features.ssh?
+      raise 'Connecting with ssh to a network device requires the \'net/ssh\' ruby library'
+    end
   end
 
   def handles_login?