Diffusion puppet afc3616dc31f

Merge branch '2.6.x' into 2.7.x
afc3616dc31fUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.x' into 2.7.x

2.6.x: (maint) Cleanup and strengthen acceptance tests (#7144) Update Settings#writesub to convert mode to Fixnum (maint) Fix platform dection for RHEL

Manually Resolved Conflicts:
acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb
spec/unit/util/settings_spec.rb

Details

Provenance

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

Parents

rPU790e947e5581: Merge branch 'maint/2.6.x/replace_regex_with_asserts' into 2.6.x
rPUacf5d3ae8c45: Merge branch 'ticket/2.7.x/maint-fix_doc_link' into 2.7.x

Branches

Unknown

Tags

Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPUafc3616dc31f: Merge branch '2.6.x' into 2.7.x (authored by Matt Robinson <matt@puppetlabs.com>).Jul 15 2011, 12:27 AM

Merged Changes

790e947e5581 Merge branch 'maint/2.6.x/replace_regex_with_asserts' into 2.6.x
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
a109c908f6d4 (maint) Cleanup and strengthen acceptance tests
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
e806e58b19a9 Merge branch 'ticket/2.6.x/7144-private-keys' into 2.6.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
b268fb3d4cca (#7144) Update Settings#writesub to convert mode to Fixnum
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
b8e67ba44f76 Merge branch 'maint/2.6.x/fix_plaform_detection' into 2.6.x
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
4a2f22c00d13 (maint) Fix platform dection for RHEL
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (20)

Path

Size

acceptance/

tests/

jeff_append_to_array.rb

puppet_apply_a_file_should_create_a_file_and_report_the_md5.rb

puppet_apply_basics.rb

puppet_apply_should_show_a_notice.rb

resource/

service/

ticket_4123_should_list_all_running_redhat.rb

ticket_4124_should_list_all_disabled.rb

ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

ticket_4059_ralsh_can_change_settings.rb

ticket_4110_puppet_apply_should_not_create_a_user_that_already_exists.rb

ticket_4233_resource_with_a_newline.rb

ticket_4285_file_resource_fail_when_name_defined_instead_of_path.rb

ticket_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement.rb

ticket_4289_facter_should_recognize_OEL_operatingsystemrelease.rb

ticket_4293_define_and_use_a_define_within_a_class.rb

ticket_5477_master_not_dectect_sitepp.rb

ticket_6541_invalid_filebucket_files.rb

ticket_6734_6256_5530_5503.rb

lib/

puppet/

util.rb

util/

settings.rb

spec/

unit/

util/

settings_spec.rb

rPUafc3616dc31f

View Options

acceptance/tests/jeff_append_to_array.rb

View Options

acceptance/tests/puppet_apply_a_file_should_create_a_file_and_report_the_md5.rb

View Options

acceptance/tests/puppet_apply_basics.rb

View Options

acceptance/tests/puppet_apply_should_show_a_notice.rb

View Options

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

View Options

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb

View Options

acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

View Options

acceptance/tests/ticket_4059_ralsh_can_change_settings.rb

View Options

acceptance/tests/ticket_4110_puppet_apply_should_not_create_a_user_that_already_exists.rb

View Options

acceptance/tests/ticket_4233_resource_with_a_newline.rb

View Options

acceptance/tests/ticket_4285_file_resource_fail_when_name_defined_instead_of_path.rb

View Options

acceptance/tests/ticket_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement.rb

View Options

acceptance/tests/ticket_4289_facter_should_recognize_OEL_operatingsystemrelease.rb

View Options

acceptance/tests/ticket_4293_define_and_use_a_define_within_a_class.rb

View Options

acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

View Options

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

View Options

acceptance/tests/ticket_6734_6256_5530_5503.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/settings.rb

View Options

spec/unit/util/settings_spec.rb

Merge branch '2.6.x' into 2.7.xafc3616dc31fUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (20)

rPUafc3616dc31f

acceptance/tests/jeff_append_to_array.rb

acceptance/tests/puppet_apply_a_file_should_create_a_file_and_report_the_md5.rb

acceptance/tests/puppet_apply_basics.rb

acceptance/tests/puppet_apply_should_show_a_notice.rb

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb

acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

acceptance/tests/ticket_4059_ralsh_can_change_settings.rb

acceptance/tests/ticket_4110_puppet_apply_should_not_create_a_user_that_already_exists.rb

acceptance/tests/ticket_4233_resource_with_a_newline.rb

acceptance/tests/ticket_4285_file_resource_fail_when_name_defined_instead_of_path.rb

acceptance/tests/ticket_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement.rb

acceptance/tests/ticket_4289_facter_should_recognize_OEL_operatingsystemrelease.rb

acceptance/tests/ticket_4293_define_and_use_a_define_within_a_class.rb

acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

acceptance/tests/ticket_6734_6256_5530_5503.rb

lib/puppet/util.rb

lib/puppet/util/settings.rb

spec/unit/util/settings_spec.rb

Merge branch '2.6.x' into 2.7.x
afc3616dc31fUnpublished
Actions