Merge branch '2.7.x'
ba6230b6039dUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Details

Provenance

Nick Lewis <nick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU8820a78b5793: Replace calls to Array#count with #length
rPUe8a2287cdac5: Merge branch 'remove-http-pool-keep-alive'

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPUba6230b6039d: Merge branch '2.7.x' (authored by Nick Lewis <nick@puppetlabs.com>).Jul 21 2011, 1:35 AM

Merged Changes

8820a78b5793 Replace calls to Array#count with #length
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
bdd6a17c9951 Fix order-dependent test failure in certificate_status/file spec
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
da504b3a0004 Merge branch 'feature/2.7.x/6789-port-ca-interface-to-faces' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
c830ab01f31b (#6789) Port SSL::CertificateAuthority::Interface to a Face
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
cc311ad3dcb7 maint: SSL::Inventory.serial should report missing names.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
72abe6ce7192 (#7204) Consolidate Semantic Versioning code.
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
756314da4e48 Merge branch 'issue/2.7.x/7699' into 2.7.x
Author
Dan Bode <dan@puppetlabs.com>
Browse Repository
No Builds
No Audits
833edd0abaa1 Merge branch 'ticket/2.7.x/8401-docs-detailed-exitcodes' into 2.7.x
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
d02000bf0060 (#8401) Document that --detailed-exitcodes is a bitmask
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
afc3616dc31f Merge branch '2.6.x' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
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
acf5d3ae8c45 Merge branch 'ticket/2.7.x/maint-fix_doc_link' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
c4848d25f513 maint: Fix documentation link for fileserver configuration
Author
Matt Robinson <matt@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
b82f29c61aa8 (#7699) Help command should only list options once
Author
Dan Bode <dan@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
8730b290c4f4 Merge branch 'ticket/2.7.x/4142-metadata_json' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
45b3908e0373 (#4142) Fix module check not to fail when empty metadata.json
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
1feccc3f2db2 Revert "Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into 2.
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
b7ee0258ab40 Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into 2.7.x
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
ae3ef423c03b (#7699) - Help should only show options once
Author
Dan Bode <dan@puppetlabs.com>
Browse Repository
No Builds
No Audits
8fe2e555ac3d Merge branch 'ticket/2.7.x/8032_create_resource_containment' into 2.7.x
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
5826f7399325 (#8032) Add containment to create_resources
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
d58eacd6b4ab Merge branch 'ticket/2.7.x/8147' into 2.7.x
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
98cd89bdd44a (#8147) Update test for default reporturl
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
f6882d6d5779 (#8147) Change default reporturl to match newer Dashboard versions
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits

Changes (43)

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/

application/

face/

interface/

ssl/

type/

file/

util/

spec/

integration/

defaults_spec.rb

shared_behaviours/

things_that_declare_options.rb

unit/

face/

ca_spec.rb

indirector/

certificate_status/

file_spec.rb

interface/

action_spec.rb

face_collection_spec.rb

util/

rPUba6230b6039d

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/application/agent.rb

View Options

lib/puppet/application/apply.rb

View Options

lib/puppet/application/ca.rb

View Options

lib/puppet/application/device.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/face/ca.rb

View Options

lib/puppet/interface.rb

View Options

lib/puppet/interface/action.rb

View Options

lib/puppet/interface/face_collection.rb

View Options

lib/puppet/interface/option_manager.rb

View Options

lib/puppet/module.rb

View Options

lib/puppet/ssl/inventory.rb

View Options

lib/puppet/type/file/source.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/settings.rb

View Options

lib/semver.rb

View Options

spec/integration/defaults_spec.rb

View Options

spec/shared_behaviours/things_that_declare_options.rb

View Options

spec/unit/face/ca_spec.rb

View Options

spec/unit/indirector/certificate_status/file_spec.rb

View Options

spec/unit/interface/action_spec.rb

View Options

spec/unit/interface/face_collection_spec.rb

View Options

spec/unit/interface_spec.rb

View Options

spec/unit/module_spec.rb

View Options

spec/unit/semver_spec.rb

View Options

spec/unit/util/settings_spec.rb

Merge branch '2.7.x'ba6230b6039dUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (43)

rPUba6230b6039d

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/application/agent.rb

lib/puppet/application/apply.rb

lib/puppet/application/ca.rb

lib/puppet/application/device.rb

lib/puppet/defaults.rb

lib/puppet/face/ca.rb

lib/puppet/interface.rb

lib/puppet/interface/action.rb

lib/puppet/interface/face_collection.rb

lib/puppet/interface/option_manager.rb

lib/puppet/module.rb

lib/puppet/ssl/inventory.rb

lib/puppet/type/file/source.rb

lib/puppet/util.rb

lib/puppet/util/settings.rb

lib/semver.rb

spec/integration/defaults_spec.rb

spec/shared_behaviours/things_that_declare_options.rb

spec/unit/face/ca_spec.rb

spec/unit/indirector/certificate_status/file_spec.rb

spec/unit/interface/action_spec.rb

spec/unit/interface/face_collection_spec.rb

spec/unit/interface_spec.rb

spec/unit/module_spec.rb

spec/unit/semver_spec.rb

spec/unit/util/settings_spec.rb

Merge branch '2.7.x'
ba6230b6039dUnpublished
Actions