diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
| commit | f9e44f041b3fdc120b1c78554c35c83f7517152e (patch) | |
| tree | f5d4687277fff6fe697a92089f1fa9283dce1bb4 /lib/puppet/network | |
| parent | 99d437d2bbc2339f092304715ec562fbbcb0a50c (diff) | |
| parent | c8b294a0b0a1fc91a64c0a1ac3bab3b2aec92faf (diff) | |
| download | puppet-f9e44f041b3fdc120b1c78554c35c83f7517152e.tar.gz puppet-f9e44f041b3fdc120b1c78554c35c83f7517152e.tar.xz puppet-f9e44f041b3fdc120b1c78554c35c83f7517152e.zip | |
Merge branch '2.7.x' into 2.7.next
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/client.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/format.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb index cd88b9d84..c56b21393 100644 --- a/lib/puppet/network/client.rb +++ b/lib/puppet/network/client.rb @@ -23,7 +23,7 @@ class Net::HTTP # JJM: This is a "backport" of sorts to older ruby versions which # do not have this accessor. See #896 for more information. - attr_accessor :enable_post_connection_check unless Net::HTTP.instance_methods.include? "enable_post_connection_check" + attr_accessor :enable_post_connection_check unless Net::HTTP.method_defined? "enable_post_connection_check" end # The base class for all of the clients. Many clients just directly diff --git a/lib/puppet/network/format.rb b/lib/puppet/network/format.rb index 9cd6cf0b5..69895c344 100644 --- a/lib/puppet/network/format.rb +++ b/lib/puppet/network/format.rb @@ -106,6 +106,6 @@ class Puppet::Network::Format method = send(name) - return(type == :class ? klass.respond_to?(method) : klass.instance_methods.include?(method)) + return(type == :class ? klass.respond_to?(method) : klass.method_defined?(method)) end end |