Merge branch '2.7.next' into next
fc66e98b84b9Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.next' into next

Details

Provenance

Josh Cooper <josh@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUe396d8042c83: Merge branch '2.6.next' into 2.7.next
rPU06b8e7608eb8: Merge branch 'maint/defined_type_has_two_parents' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPUfc66e98b84b9: Merge branch '2.7.next' into next (authored by Josh Cooper <josh@puppetlabs.com>).Apr 21 2011, 11:26 PM

Merged Changes

e396d8042c83 Merge branch '2.6.next' into 2.7.next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
7b0cf6dc3e41 Merge branch 'ticket/2.7.next/7021-order_dependent_test_failure' into 2.7.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
c3a76a982268 (#7021) Fix order dependent spec failures
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
7bd6a2f37bed maint: Remove unused code
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
0b9c7adce13c Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
34f9f4162827 Maint: Fix a #4655 introduced log inconsistency
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6b18f8f01f12 Move acceptance tests from puppet-acceptance repo
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
f6afa8722a58 Merge branch 'ticket/2.6.next/7166' into 2.6.next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
9a5bf6e25d58 Fixed #7166 - Replaced deprecated stomp "send" method with "publish"
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
72cd6fb38333 Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2.6.
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
656eff821bec (#4655) Allow stage to be set using a default class parameter
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
16d1f784cd00 Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.next
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
ccbe9f399a5c Fixed #6681 - Remove --force-yes option from aptitude is used
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

	acceptance/	pending/
	acceptance/	tests/

ticket_3360_allow_duplicate_csr_with_option_set.rb

ticket_5027_warn_on_dynamic_scope.rb

ticket_6928_puppet_master_parse_fails.rb

	acceptance/	pending/
	examples/	etc/

	ticket_3360_reject_duplicate_csr_with_option_unset.rb
	otherfile

lib/

puppet/

provider/

network_device.rb

package/

aptitude.rb

util/

network_device.rb

spec/

unit/

util/

network_device_spec.rb

test/

lib/

puppettest/

railstesting.rb

rPUfc66e98b84b9

View Options

acceptance/pending/ticket_3360_allow_duplicate_csr_with_option_set.rb

View Options

acceptance/pending/ticket_3360_reject_duplicate_csr_with_option_unset.rb

View Options

acceptance/pending/ticket_5027_warn_on_dynamic_scope.rb

View Options

acceptance/pending/ticket_6928_puppet_master_parse_fails.rb

View Options

lib/puppet/provider/network_device.rb

View Options

lib/puppet/provider/package/aptitude.rb

View Options

lib/puppet/util/network_device.rb

View Options

spec/unit/util/network_device_spec.rb

View Options

test/lib/puppettest/railstesting.rb

Merge branch '2.7.next' into nextfc66e98b84b9UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (9)

rPUfc66e98b84b9

acceptance/pending/ticket_3360_allow_duplicate_csr_with_option_set.rb

acceptance/pending/ticket_3360_reject_duplicate_csr_with_option_unset.rb

acceptance/pending/ticket_5027_warn_on_dynamic_scope.rb

acceptance/pending/ticket_6928_puppet_master_parse_fails.rb

lib/puppet/provider/network_device.rb

lib/puppet/provider/package/aptitude.rb

lib/puppet/util/network_device.rb

spec/unit/util/network_device_spec.rb

test/lib/puppettest/railstesting.rb

Merge branch '2.7.next' into next
fc66e98b84b9Unpublished
Actions