Merge branch '2.6.x' into 2.7.x
711cbf0af406Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.x' into 2.7.x

Conflicts:
acceptance/pending/ticket_3360_allow_duplicate_csr_with_option_set.rb
lib/puppet/util/command_line/puppetca

Details

Provenance

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

Parents

rPU7514d325c01e: missing includes in network XML-RPC handlers
rPU2b7c27347b23: Merge pull request #186 from nicklewis/ticket/2.7.x/10346

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPU711cbf0af406: Merge branch '2.6.x' into 2.7.x (authored by Nick Lewis <nick@puppetlabs.com>).Oct 28 2011, 10:12 PM

Merged Changes

7514d325c01e missing includes in network XML-RPC handlers
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2d24ef04a74f Merge remote-tracking branch 'upstream/2.6rc' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
397a5064892c (#10244) Restore Mongrel XMLRPC functionality
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8d54c23f5ac6 Merge branch '2.6rc' into 2.6.x
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
fcaf7c5eb10c Updated CHANGELOG for 2.6.12
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
f51d221ee300 Improve the error message when a CSR is rejected
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
d55174788416 Allow a master to bootstrap itself with dns_alt_names and autosign
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
040519685ca7 (maint) Remove ssl dir before starting a master with DNS alt names
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
3ed6499c6e52 Backport Enumerable#count to Rubies < 1.8.7
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
5f44c23b0a9d More 1.8.5 compatibility fixes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
ef1b9602fb2a Better 1.8.5 compatible implementation of `lines`.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
246e875336ed (#2848) Config options require '_', not '-'.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
3bdeb3a4a666 Ruby 1.8.5 compatibility changes in tests and code.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
6866d4b6606f Add `lines` alias for `each_line` in Ruby 1.8.5.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
2f9ec3cafb2e s/not_to/should_not/ for older versions of RSpec 2.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
56320ea80c26 (#2848) Eliminate redundant `master_dns_alt_names`.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
de1986196b5c (#2848) Remove the legacy SSLCertificates code
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
cf008a6277dd (#2848) Rework the xmlrpc CA handler to use the modern SSL code
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
32be180cee78 (#2848) Remove unused xmlrpc code
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
5f2a44d78a64 (#2848) Consistent return values from `subject_alt_names` accessors.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
5e507f20fbfa (#2848) Consistently use `subject_alt_names` as accessor name.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
5ac2417c297c (#2848) Don't strip the subjectAltName label when listing.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
44cf3a280dd3 (#2848) Don't enable `emailProtection` for server keys.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
d66def936f09 (#2848) Only mark `subjectAltName` critical if `subject` is empty.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
81740470cb81 (#2848) Migrate `dns-alt-names` back to settings.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
f18df2bef58d Wire up the `setbycli` slot in Puppet settings.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
efa61f2cc5c6 (#2848) rename subject-alt-name option to dns-alt-names
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
f103b2085f47 (#2848) Rename `certdnsnames` to match new behaviour.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
363b47b29a9e (#2848) Use `certdnsnames` when bootstrapping a local master.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
49334ff2256a (#2848) CSR subjectAltNames handling while signing.
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
5f2af934ad87 (#2848) List subject alt names in output of puppet cert --list
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
bb475ec7a68d (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
bab9310d2800 (#2848) Rewrite SSL Certificate Factory, fixing `subjectAltName` leak.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
fca1ff08e263 (#2848) Reject unknown (== all) extensions on the CSR.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
443a7561b63c (#2848) extract the subjectAltName value from the CSR.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
66101f13b781 (#2848) Set `certdnsnames` values into the CSR.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
77b814f45823 (#6928) Don't blow up when the method is undefined...
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
5427f1e93d15 (#6928) backport Symbol#to_proc for Ruby < 1.8.7
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

lib/

puppet/

network/

handler/

fileserver.rb

http_server/

mongrel.rb

ssl/

certificate_request.rb

host.rb

rPU711cbf0af406

View Options

lib/puppet/network/handler/fileserver.rb

View Options

lib/puppet/network/http_server/mongrel.rb

View Options

lib/puppet/ssl/certificate_request.rb

View Options

Merge branch '2.6.x' into 2.7.x711cbf0af406UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (4)

rPU711cbf0af406

lib/puppet/network/handler/fileserver.rb

lib/puppet/network/http_server/mongrel.rb

lib/puppet/ssl/certificate_request.rb

lib/puppet/ssl/host.rb

Merge branch '2.6.x' into 2.7.x
711cbf0af406Unpublished
Actions