Diffusion puppet c8215c550cbe

Merge branch 'next'
c8215c550cbeUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'next'

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

Details

Provenance

Matt Robinson <matt@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUa8e4df735abc: Merge branch '2.7.next' into next
rPU82fb02ce27c9: Merge branch 'next'

Branches

Unknown

Tags

Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPUc8215c550cbe: Merge branch 'next' (authored by Matt Robinson <matt@puppetlabs.com>).May 14 2011, 12:06 AM

Merged Changes

a8e4df735abc Merge branch '2.7.next' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
4b7afaa06538 Merge branch '2.7.x' into 2.7.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
d63fc34d0c6f Revert "(#7220) Add the ability to "inherit" options."
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
61d732231fa1 Merge branch 'ticket/2.7.x/7469-rake-failures' into 2.7.x
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
09f5d9cbfcbc (#7469) Add license to test face so tests pass
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
c7bd46e2eb1d Merge branch 'ticket/2.7.x/7264-metaparameter_reference' into 2.7.x
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
a44cbb1b9a03 (#7264) Docs: Clarify that subscribe/notify imply require/before
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
68909707d4ed Merge branch 'tickets/2.7.x/7299' into 2.7.x
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
7a3a37366dde Merge branch 'ticket/2.7.x/7468-stub_xmlrpc_internet_call' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
9377507499f7 (#7468) Stub spec that tries to connect to pypi.python.org
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
5db214c486b8 Prevent spec failure caused by network device mock leak
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
37225200eb39 Fix #7299 - do not require net/ssh for running rake spec
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

lib/

puppet/

interface/

action_builder.rb

util/

network_device/

transport/

spec/

unit/

application/

indirection_base_spec.rb

interface/

action_builder_spec.rb

provider/

package/

rPUc8215c550cbe

lib/puppet/interface/action.rb

Loading...

lib/puppet/interface/action_builder.rb

Loading...

lib/puppet/util/network_device/transport/ssh.rb

Loading...

spec/unit/application/indirection_base_spec.rb

Loading...

spec/unit/interface/action_builder_spec.rb

Loading...

spec/unit/interface/action_spec.rb

Loading...

spec/unit/provider/package/pip_spec.rb

Loading...