Diffusion puppet 8772bb7659a8

Merge branch '2.7.x'
8772bb7659a8Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

2.7.x: (23 commits) Clean up indentation, whitespace, and commented out code Remove order dependency from functions integration spec (#7956) Porting cron tests (#7956) Port resource acceptance tests (#8048) Gem install puppet no longer fails if rdoc enabled. Updating for 2.7.1 release. (#8048) Gem install puppet no longer fails if rdoc enabled. Readying for release of 2.6.9 Updating CHANGELOG for 2.7.0 (#6854) Update Red Hat spec file Bumping release in lib/puppet.rb and updating CHANGELOG. Bumping RPM spec file to 2.6.9rc1. (#7224) Reword 'hostname was not match' error message (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names (#7506) Organize READMEs; specify supported Ruby versions in README.md (#7506) Specify supported Ruby versions in README.md (#5641) Help text: document that puppet doc takes modulepath, manifestdir, and environment options (#6418) Make test 64118 more portable (#7127) Stop puppet if a prerun command fails Do not needlessly create multiple reports when creating a transaction ...

Details

Provenance

Jacob Helwig <jacob@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU8432684e25cc: Merge branch '2.6.x' into 2.7.x
rPUcf93404e53aa: Merge branch 'template-not-defined-test-failure'

Branches

Unknown

Tags

Unknown

Event Timeline

Jacob Helwig <jacob@puppetlabs.com> committed rPU8772bb7659a8: Merge branch '2.7.x' (authored by Jacob Helwig <jacob@puppetlabs.com>).Jun 29 2011, 3:05 AM

Merged Changes

8432684e25cc Merge branch '2.6.x' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
1feaf7cf163c Merge branch 'template-not-defined-test-failure-2.7.x' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
7ad1b04244e0 Clean up indentation, whitespace, and commented out code
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
014d95288324 Remove order dependency from functions integration spec
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
8bad457fb68f Merge branch '2.6rc' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
f389a9a05ded Merge branch 'ticket/2.6.x/7956' into 2.6.x
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
243aaa9929ae (#7956) Porting cron tests
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
567589c26ea0 Merge branch 'maint/2.6.x/add_ported_resources_tests_from_enterpise_dist' into…
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
3e3fc693c2a9 (#7956) Port resource acceptance tests
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
534ccfe8d8ca (#8048) Gem install puppet no longer fails if rdoc enabled.
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
cb23e5a7207e Merging up 2.7.1
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
a23e39165a95 Updating for 2.7.1 release.
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
a49d5b885a62 (#8048) Gem install puppet no longer fails if rdoc enabled.
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
bbde5b599b9c Readying for release of 2.6.9
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
36d8caff1896 Updating CHANGELOG for 2.7.0
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
c9746538f486 Merge branch '2.6rc' into 2.6.x
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
1b3130c4eb17 Merge branch 'tickets/2.6rc/6854' of git://jet.mox.net/~tmz/puppet into 2.6rc
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
31554c086eb2 (#6854) Update Red Hat spec file
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
cba645c8b8a2 Bumping release in lib/puppet.rb and updating CHANGELOG.
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
43027deaef48 Bumping RPM spec file to 2.6.9rc1.
Author
stahnma <stahnma@websages.com>
Browse Repository
No Builds
No Audits
c6909a6c9f64 Merge branch '2.6.x' into 2.6rc
Author
stahnma <stahnma@websages.com>
Browse Repository
No Builds
No Audits
6ae3538a58ea Merge branch 'ticket/2.7.x/7224' into 2.7.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
99330fa56d5f (#7224) Reword 'hostname was not match' error message
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
1d867b026dbf (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
fc530ac518db Merge branch 'ticket/2.6.x/7506' into 2.6.x
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
db1a392e3fce (#7506) Organize READMEs; specify supported Ruby versions in README.md
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
1a33bf86b740 (#7506) Specify supported Ruby versions in README.md
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
2e95568be7df Merge branch 'ticket/2.7.x/5641' into 2.7.x
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
de064693c3b6 (#5641) Help text: document that puppet doc takes modulepath, manifestdir, and…
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
4fb7cfe31795 Merge branch 'ticket/2.6.x/6418' into 2.6.x
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
381fa409207a (#6418) Make test 64118 more portable
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
f8c11329f1e0 Merge branch 'ticket/2.6.x/7127-prerun-command-failures-dont-stop-puppet' into…
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
98ba4071f424 (#7127) Stop puppet if a prerun command fails
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
6996e0bbfb35 Do not needlessly create multiple reports when creating a transaction
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
01c11424b611 Merge branch 'ticket/2.6.x/4416' into 2.6.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
caca469976cc (#4416) Ensure types are providified after reloading
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
413b13667123 (#4416) Always remove old provider before recreating it
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
d866ce187d45 Cleanup indentation, comment, and unused code
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (57)

Path

Size

acceptance/

tests/

helpful_error_message_when_hostname_not_match_server_certificate.rb

resource/

cron/

should_create_cron.rb

	should_match_existing.rb
	should_create_cron.rb

should_remove_cron.rb

should_remove_matching.rb

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

source_attribtute.rb

group/

should_create.rb

should_modify_gid.rb

host/

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

service/

ticket_4123_should_list_all_running_redhat.rb

user/

should_create.rb

should_create_with_gid.rb

should_destroy.rb

should_modify_gid.rb

should_not_destoy_unexisting.rb

should_query.rb

ticket_3360_allow_duplicate_csr_with_option_set.rb

ticket_6418_file_recursion_and_audit.rb

conf/

redhat/

lib/

puppet/

application/

indirector/

interface/

metatype/

resource/

ssl/

transaction/

spec/

integration/

shared_behaviours/

things_that_declare_options.rb

unit/

application/

configurer_spec.rb

indirector/

certificate/

resource/

catalog_spec.rb

ssl/

certificate_spec.rb

transaction_spec.rb

rPU8772bb7659a8

CHANGELOG

Loading...

README.md

Loading...

acceptance/tests/helpful_error_message_when_hostname_not_match_server_certificate.rb

Loading...

acceptance/tests/resource/cron/should_create_cron.rb

Loading...

acceptance/tests/resource/cron/should_match_existing.rb

Loading...

acceptance/tests/resource/cron/should_remove_cron.rb

Loading...

acceptance/tests/resource/cron/should_remove_matching.rb

Loading...

acceptance/tests/resource/cron/should_update_existing.rb

Loading...

acceptance/tests/resource/file/content_attribute.rb

Loading...

acceptance/tests/resource/file/should_create_directory.rb

Loading...

acceptance/tests/resource/file/should_create_empty.rb

Loading...

acceptance/tests/resource/file/should_create_symlink.rb

Loading...

acceptance/tests/resource/file/should_remove_dir.rb

Loading...

acceptance/tests/resource/file/should_remove_file.rb

Loading...

acceptance/tests/resource/file/source_attribtute.rb

Loading...

acceptance/tests/resource/group/should_create.rb

Loading...

acceptance/tests/resource/group/should_modify_gid.rb

Loading...

acceptance/tests/resource/host/should_create.rb

Loading...

acceptance/tests/resource/host/should_create_aliases.rb

Loading...

acceptance/tests/resource/host/should_destroy.rb

Loading...

acceptance/tests/resource/host/should_modify_alias.rb

Loading...

acceptance/tests/resource/host/should_modify_ip.rb

Loading...

acceptance/tests/resource/host/should_not_create_existing.rb

Loading...

acceptance/tests/resource/host/should_query.rb

Loading...

acceptance/tests/resource/host/should_query_all.rb

Loading...

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

Loading...

acceptance/tests/resource/user/should_create.rb

Loading...

acceptance/tests/resource/user/should_create_with_gid.rb

Loading...

acceptance/tests/resource/user/should_destroy.rb

Loading...

acceptance/tests/resource/user/should_modify_gid.rb

Loading...

acceptance/tests/resource/user/should_not_destoy_unexisting.rb

Loading...

acceptance/tests/resource/user/should_query.rb

Loading...

acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb

Loading...

acceptance/tests/ticket_6418_file_recursion_and_audit.rb

Loading...

conf/redhat/puppet.spec

Loading...

lib/puppet.rb

Loading...

lib/puppet/application/apply.rb

Loading...

lib/puppet/application/doc.rb

Loading...

lib/puppet/configurer.rb

Loading...

lib/puppet/indirector/rest.rb

Loading...

lib/puppet/interface/option.rb

Loading...

lib/puppet/metatype/manager.rb

Loading...

lib/puppet/resource/catalog.rb

Loading...

lib/puppet/ssl/certificate.rb

Loading...

lib/puppet/transaction.rb

Loading...

lib/puppet/transaction/report.rb

Loading...

lib/puppet/type.rb

Loading...

spec/integration/type_spec.rb

Loading...

spec/shared_behaviours/things_that_declare_options.rb

Loading...

spec/unit/application/apply_spec.rb

Loading...

spec/unit/configurer_spec.rb

Loading...

spec/unit/indirector/certificate/rest_spec.rb

Loading...

spec/unit/indirector/rest_spec.rb

Loading...

spec/unit/resource/catalog_spec.rb

Loading...

spec/unit/ssl/certificate_spec.rb

Loading...

spec/unit/transaction_spec.rb

Loading...

spec/unit/type_spec.rb

Loading...