Diffusion puppet ce6025042bce

Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc
ce6025042bceUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc

upstream/2.7.x: (#8858) Explicitly set SSL peer verification mode. Test SSL setup code, not our stubbing of it. (maint) Add mailmap to identify contributors Updating CHANGELOG, conf/redhat/puppet.spec for puppet 2.7.15rc4 (#14723) Fix http report description Remove EL-related test changes from this commit. Revert changes to symbolic_modes.rb -- this test should indeed be pending (it should eventually work on Windows). Update acceptance tests to use confine instead of skip_test loops

Conflicts:
CHANGELOG
conf/redhat/puppet.spec

Details

Provenance

Andrew Parker <andy@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUfb4c64b6a54b: Merge pull request #818 from lotheac/fix_http_report_desc
rPUd58a7cce3b66: Updating CHANGELOG, conf/redhat/puppet.spec for 3.0.0rc3

Branches

Unknown

Tags

Unknown

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPUce6025042bce: Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc (authored by Andrew Parker <andy@puppetlabs.com>).Jun 6 2012, 8:31 PM

Merged Changes

fb4c64b6a54b Merge pull request #818 from lotheac/fix_http_report_desc
Author
nfagerlund <nick.fagerlund@puppetlabs.com>
Browse Repository
No Builds
No Audits
a212090bacd5 Merge remote-tracking branch 'daniel-pittman/bug/2.7.x/8858-ruby-19-default-to…
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
3a0624628c66 (#8858) Explicitly set SSL peer verification mode.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
cd4bee829fe2 Test SSL setup code, not our stubbing of it.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
ff052b8548e5 (maint) Add mailmap to identify contributors
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
1d8f6c6c9957 Merge branch '2.7rc' into 2.7.x
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
d110da5f6565 Updating CHANGELOG, conf/redhat/puppet.spec for puppet 2.7.15rc4
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
401aa7fac2d3 Merge remote-tracking branch 'origin/2.7rc' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
9758fdc59698 Merge branch '2.7rc' into 2.7.x
Author
Moses Mendoza <moses@puppetlabs.com>
Browse Repository
No Builds
No Audits
8dda6c223477 (#14723) Fix http report description
Author
Lauri Tirkkonen <lotheac@iki.fi>
Browse Repository
No Builds
No Audits
8db4418ebb80 Merge pull request #736 from mkincaid/27confines
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
ebf538665e81 Remove EL-related test changes from this commit.
Author
Michael Kincaid <michael@puppetlabs.com>
Browse Repository
No Builds
No Audits
2aea708dc958 Revert changes to symbolic_modes.rb -- this test should indeed be pending (it…
Author
Michael Kincaid <michael@puppetlabs.com>
Browse Repository
No Builds
No Audits
b601bb4173dd Update acceptance tests to use confine instead of skip_test loops
Author
Michael Kincaid <michael@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

acceptance/

tests/

allow_symlinks_as_config_directories.rb

resource/

cron/

should_create_cron.rb

should_match_existing.rb

should_remove_cron.rb

should_remove_matching.rb

should_update_existing.rb

exec/

accept_multi-line_commands.rb

file/

should_create_symlink.rb

ticket_8740_should_not_enumerate_root_directory.rb

group/

should_modify_gid.rb

user/

should_create_with_gid.rb

should_modify_gid.rb

ticket_3961_puppet_ca_should_produce_certs.rb

conf/

redhat/

lib/

puppet/

network/

reports/

spec/

unit/

network/

http_pool_spec.rb

rPUce6025042bce

.mailmap

Loading...

CHANGELOG

Loading...

acceptance/tests/allow_symlinks_as_config_directories.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/exec/accept_multi-line_commands.rb

Loading...

acceptance/tests/resource/file/should_create_symlink.rb

Loading...

acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb

Loading...

acceptance/tests/resource/group/should_modify_gid.rb

Loading...

acceptance/tests/resource/user/should_create_with_gid.rb

Loading...

acceptance/tests/resource/user/should_modify_gid.rb

Loading...

acceptance/tests/ticket_3961_puppet_ca_should_produce_certs.rb

Loading...

conf/redhat/puppet.spec

Loading...

lib/puppet/network/http_pool.rb

Loading...

lib/puppet/reports/http.rb

Loading...

spec/unit/network/http_pool_spec.rb

Loading...