Merge branch '2.6.next' into 2.7.next
e396d8042c83Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' into 2.7.next

Manually resolved conflicts:
lib/puppet/parser/resource.rb
lib/puppet/parser/scope.rb
spec/unit/parser/scope_spec.rb

Details

Provenance

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

Parents

rPU0b9c7adce13c: Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next
rPU7b0cf6dc3e41: Merge branch 'ticket/2.7.next/7021-order_dependent_test_failure' into 2.7.next

Branches

Unknown

Tags

Unknown

References

tag: Iteration-2011-04-21-2.7.x

Event Timeline

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

Merged Changes

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 (113)

Path

Size

acceptance

pending

ticket_3360_allow_duplicate_csr_with_option_set.rb

ticket_4149_parseonly_should_not_fail.rb

ticket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources.rb

ticket_5027_warn_on_dynamic_scope.rb

ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

ticket_6928_puppet_master_parse_fails.rb

tests

apply

classes

parameterized_classes.rb

should_allow_param_override.rb

should_allow_param_undef_override.rb

should_include_resources_from_class.rb

should_not_auto_include_resources_from_class.rb

conditionals

should_evaluate_else.rb

should_evaluate_elsif.rb

should_evaluate_empty.rb

should_evaluate_false.rb

should_evaluate_if.rb

should_evaluate_strings_true.rb

should_evaluate_undef.rb

hashes

should_not_reassign.rb

virtual

should_realize.rb

should_realize_complex_query.rb

should_realize_many.rb

should_realize_query.rb

should_realize_query_array.rb

doc

should_print_function_reference.rb

ticket_4120_cannot_generate_type_reference.rb

file_hello_world.rb

jeff_append_to_array.rb

key_compare_puppet_conf_configprint.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

puppet_master_help_should_mention_puppet_master.rb

resource

cron

should_create_cron.rb

should_match_existing.rb

should_remove_cron.rb

should_remove_matching.rb

should_update_existing.rb

exec

should_not_run_command_creates.rb

should_run_command.rb

should_set_path.rb

file

content_attribute.rb

should_create_directory.rb

should_create_empty.rb

should_create_symlink.rb

should_remove_dir.rb

should_remove_file.rb

should_not_create_existing.rb

should_not_destoy_unexisting.rb

should_create_aliases.rb

should_destroy.rb

should_modify_alias.rb

should_modify_ip.rb

should_not_create_existing.rb

should_query.rb

should_query_all.rb

ticket_4131_should_not_create_without_ip.rb

service

ticket_4123_should_list_all_running_redhat.rb

ticket_4123_should_list_all_running_redhat.sh

ticket_4124_should_list_all_disabled.rb

ticket_4124_should_list_all_disabled.sh

user

should_create.rb

should_create_with_gid.rb

should_destroy.rb

should_modify_gid.rb

should_not_create_existing.rb

should_not_destoy_unexisting.rb

should_query.rb

should_query_all.rb

stages

ticket_4655_default_stage_for_classes.rb

ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

ticket_3656_requiring_multiple_resources.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_4404_should_allow_stage_main_on_left_side_of_relationship.rb

ticket_4423_cannot_declare_two_parameterized_classes.rb

ticket_5477_master_not_dectect_sitepp.rb

ticket_6418_file_recursion_and_audit.rb

ticket_6541_invalid_filebucket_files.rb

ticket_6734_6256_5530_5503.rb

	acceptance/	pending/
	examples/	etc/

	ticket_3360_reject_duplicate_csr_with_option_unset.rb
	otherfile

lib/

puppet/

parser/

resource.rb

provider/

package/

aptitude.rb

rPUe396d8042c83

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_4149_parseonly_should_not_fail.rb

View Options

acceptance/pending/ticket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources.rb

View Options

acceptance/pending/ticket_5027_warn_on_dynamic_scope.rb

View Options

acceptance/pending/ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

View Options

acceptance/pending/ticket_6928_puppet_master_parse_fails.rb

View Options

acceptance/tests/apply/classes/parameterized_classes.rb

View Options

acceptance/tests/apply/classes/should_allow_param_override.rb

View Options

acceptance/tests/apply/classes/should_allow_param_undef_override.rb

View Options

acceptance/tests/apply/classes/should_include_resources_from_class.rb

View Options

acceptance/tests/apply/classes/should_not_auto_include_resources_from_class.rb

View Options

acceptance/tests/apply/conditionals/should_evaluate_else.rb

View Options

acceptance/tests/apply/conditionals/should_evaluate_elsif.rb

View Options

acceptance/tests/apply/conditionals/should_evaluate_empty.rb

View Options

acceptance/tests/apply/conditionals/should_evaluate_false.rb

View Options

acceptance/tests/apply/conditionals/should_evaluate_if.rb

View Options

acceptance/tests/apply/conditionals/should_evaluate_strings_true.rb

View Options

acceptance/tests/apply/conditionals/should_evaluate_undef.rb

View Options

acceptance/tests/apply/hashes/should_not_reassign.rb

View Options

acceptance/tests/apply/virtual/should_realize.rb

View Options

acceptance/tests/apply/virtual/should_realize_complex_query.rb

View Options

acceptance/tests/apply/virtual/should_realize_many.rb

View Options

acceptance/tests/apply/virtual/should_realize_query.rb

View Options

acceptance/tests/apply/virtual/should_realize_query_array.rb

View Options

acceptance/tests/doc/should_print_function_reference.rb

View Options

acceptance/tests/doc/ticket_4120_cannot_generate_type_reference.rb

View Options

acceptance/tests/file_hello_world.rb

View Options

acceptance/tests/jeff_append_to_array.rb

View Options

acceptance/tests/key_compare_puppet_conf_configprint.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/puppet_master_help_should_mention_puppet_master.rb

View Options

acceptance/tests/resource/cron/should_create_cron.rb

View Options

acceptance/tests/resource/cron/should_match_existing.rb

View Options

acceptance/tests/resource/cron/should_remove_cron.rb

View Options

acceptance/tests/resource/cron/should_remove_matching.rb

View Options

acceptance/tests/resource/cron/should_update_existing.rb

View Options

acceptance/tests/resource/exec/should_not_run_command_creates.rb

View Options

acceptance/tests/resource/exec/should_run_command.rb

View Options

acceptance/tests/resource/exec/should_set_path.rb

View Options

acceptance/tests/resource/file/content_attribute.rb

View Options

acceptance/tests/resource/file/should_create_directory.rb

View Options

acceptance/tests/resource/file/should_create_empty.rb

View Options

acceptance/tests/resource/file/should_create_symlink.rb

View Options

acceptance/tests/resource/file/should_remove_dir.rb

View Options

acceptance/tests/resource/file/should_remove_file.rb

View Options

acceptance/tests/resource/file/source_attribtute.rb

View Options

acceptance/tests/resource/group/should_create.rb

View Options

acceptance/tests/resource/group/should_destroy.rb

View Options

acceptance/tests/resource/group/should_modify_gid.rb

View Options

acceptance/tests/resource/group/should_not_create_existing.rb

View Options

acceptance/tests/resource/group/should_not_destoy_unexisting.rb

View Options

acceptance/tests/resource/group/should_query.rb

View Options

acceptance/tests/resource/group/should_query_all.rb

View Options

acceptance/tests/resource/host/should_create.rb

View Options

acceptance/tests/resource/host/should_create_aliases.rb

View Options

acceptance/tests/resource/host/should_destroy.rb

View Options

acceptance/tests/resource/host/should_modify_alias.rb

View Options

acceptance/tests/resource/host/should_modify_ip.rb

View Options

acceptance/tests/resource/host/should_not_create_existing.rb

View Options

acceptance/tests/resource/host/should_query.rb

View Options

acceptance/tests/resource/host/should_query_all.rb

View Options

acceptance/tests/resource/host/ticket_4131_should_not_create_without_ip.rb

View Options

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

View Options

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh

View Options

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb

View Options

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.sh

View Options

acceptance/tests/resource/user/should_create.rb

View Options

acceptance/tests/resource/user/should_create_with_gid.rb

View Options

acceptance/tests/resource/user/should_destroy.rb

View Options

acceptance/tests/resource/user/should_modify_gid.rb

View Options

acceptance/tests/resource/user/should_not_create_existing.rb

View Options

acceptance/tests/resource/user/should_not_destoy_unexisting.rb

View Options

acceptance/tests/resource/user/should_query.rb

View Options

acceptance/tests/resource/user/should_query_all.rb

View Options

acceptance/tests/stages/ticket_4655_default_stage_for_classes.rb

View Options

acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

View Options

acceptance/tests/ticket_3656_requiring_multiple_resources.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_4404_should_allow_stage_main_on_left_side_of_relationship.rb

View Options

acceptance/tests/ticket_4423_cannot_declare_two_parameterized_classes.rb

View Options

acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

View Options

acceptance/tests/ticket_6418_file_recursion_and_audit.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/parser/resource.rb

View Options

lib/puppet/provider/package/aptitude.rb

Merge branch '2.6.next' into 2.7.nexte396d8042c83UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (113)

rPUe396d8042c83

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_4149_parseonly_should_not_fail.rb

acceptance/pending/ticket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources.rb

acceptance/pending/ticket_5027_warn_on_dynamic_scope.rb

acceptance/pending/ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

acceptance/pending/ticket_6928_puppet_master_parse_fails.rb

acceptance/tests/apply/classes/parameterized_classes.rb

acceptance/tests/apply/classes/should_allow_param_override.rb

acceptance/tests/apply/classes/should_allow_param_undef_override.rb

acceptance/tests/apply/classes/should_include_resources_from_class.rb

acceptance/tests/apply/classes/should_not_auto_include_resources_from_class.rb

acceptance/tests/apply/conditionals/should_evaluate_else.rb

acceptance/tests/apply/conditionals/should_evaluate_elsif.rb

acceptance/tests/apply/conditionals/should_evaluate_empty.rb

acceptance/tests/apply/conditionals/should_evaluate_false.rb

acceptance/tests/apply/conditionals/should_evaluate_if.rb

acceptance/tests/apply/conditionals/should_evaluate_strings_true.rb

acceptance/tests/apply/conditionals/should_evaluate_undef.rb

acceptance/tests/apply/hashes/should_not_reassign.rb

acceptance/tests/apply/virtual/should_realize.rb

acceptance/tests/apply/virtual/should_realize_complex_query.rb

acceptance/tests/apply/virtual/should_realize_many.rb

acceptance/tests/apply/virtual/should_realize_query.rb

acceptance/tests/apply/virtual/should_realize_query_array.rb

acceptance/tests/doc/should_print_function_reference.rb

acceptance/tests/doc/ticket_4120_cannot_generate_type_reference.rb

acceptance/tests/file_hello_world.rb

acceptance/tests/jeff_append_to_array.rb

acceptance/tests/key_compare_puppet_conf_configprint.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/puppet_master_help_should_mention_puppet_master.rb

acceptance/tests/resource/cron/should_create_cron.rb

acceptance/tests/resource/cron/should_match_existing.rb

acceptance/tests/resource/cron/should_remove_cron.rb

acceptance/tests/resource/cron/should_remove_matching.rb

acceptance/tests/resource/cron/should_update_existing.rb

acceptance/tests/resource/exec/should_not_run_command_creates.rb

acceptance/tests/resource/exec/should_run_command.rb

acceptance/tests/resource/exec/should_set_path.rb

acceptance/tests/resource/file/content_attribute.rb

acceptance/tests/resource/file/should_create_directory.rb

acceptance/tests/resource/file/should_create_empty.rb

acceptance/tests/resource/file/should_create_symlink.rb

acceptance/tests/resource/file/should_remove_dir.rb

acceptance/tests/resource/file/should_remove_file.rb

acceptance/tests/resource/file/source_attribtute.rb

acceptance/tests/resource/group/should_create.rb

acceptance/tests/resource/group/should_destroy.rb

acceptance/tests/resource/group/should_modify_gid.rb

acceptance/tests/resource/group/should_not_create_existing.rb

acceptance/tests/resource/group/should_not_destoy_unexisting.rb

acceptance/tests/resource/group/should_query.rb

acceptance/tests/resource/group/should_query_all.rb

acceptance/tests/resource/host/should_create.rb

acceptance/tests/resource/host/should_create_aliases.rb

acceptance/tests/resource/host/should_destroy.rb

acceptance/tests/resource/host/should_modify_alias.rb

acceptance/tests/resource/host/should_modify_ip.rb

acceptance/tests/resource/host/should_not_create_existing.rb

acceptance/tests/resource/host/should_query.rb

acceptance/tests/resource/host/should_query_all.rb

acceptance/tests/resource/host/ticket_4131_should_not_create_without_ip.rb

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.sh

acceptance/tests/resource/user/should_create.rb

acceptance/tests/resource/user/should_create_with_gid.rb

acceptance/tests/resource/user/should_destroy.rb

Merge branch '2.6.next' into 2.7.next
e396d8042c83Unpublished
Actions