Merge branch '2.7.x' into 2.7.next
- 2.7.x: (#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
Resolved Conflicts:
lib/puppet/util/network_device.rb
spec/unit/util/network_device_spec.rb