HomePhorge

Merge remote-tracking branch 'upstream/2.7.x' into 3.x
aa829158690eUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

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

  • upstream/2.7.x: Updated manpages, CHANGELOG, puppet.spec, puppet.rb for 2.7.16rc1. (#8858) Explicitly set SSL peer verification mode. Test SSL setup code, not our stubbing of it. (#14723) Fix http report description

Conflicts in man pages were resolved by taking the 3.x version of the
pages.

Conflicts:
CHANGELOG
conf/redhat/puppet.spec
lib/puppet.rb
man/man5/puppet.conf.5
man/man8/filebucket.8
man/man8/pi.8
man/man8/puppet-agent.8
man/man8/puppet-apply.8
man/man8/puppet-ca.8
man/man8/puppet-catalog.8
man/man8/puppet-cert.8
man/man8/puppet-certificate.8
man/man8/puppet-certificate_request.8
man/man8/puppet-certificate_revocation_list.8
man/man8/puppet-config.8
man/man8/puppet-describe.8
man/man8/puppet-device.8
man/man8/puppet-doc.8
man/man8/puppet-facts.8
man/man8/puppet-file.8
man/man8/puppet-filebucket.8
man/man8/puppet-help.8
man/man8/puppet-inspect.8
man/man8/puppet-instrumentation_data.8
man/man8/puppet-instrumentation_listener.8
man/man8/puppet-instrumentation_probe.8
man/man8/puppet-key.8
man/man8/puppet-kick.8
man/man8/puppet-man.8
man/man8/puppet-master.8
man/man8/puppet-module.8
man/man8/puppet-node.8
man/man8/puppet-parser.8
man/man8/puppet-plugin.8
man/man8/puppet-queue.8
man/man8/puppet-report.8
man/man8/puppet-resource.8
man/man8/puppet-resource_type.8
man/man8/puppet-secret_agent.8
man/man8/puppet-status.8
man/man8/puppet.8
man/man8/puppetca.8
man/man8/puppetd.8
man/man8/puppetdoc.8
man/man8/puppetmasterd.8
man/man8/puppetqd.8
man/man8/puppetrun.8
man/man8/ralsh.8
tasks/rake/gem.rake

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPUaa829158690e: Merge remote-tracking branch 'upstream/2.7.x' into 3.x (authored by Andrew Parker <andy@puppetlabs.com>).Jun 7 2012, 12:30 AM