Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next
1a00c07971c4Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next

There are test failures in commits following this one.

Details

Provenance

Jesse Wolfe <jes5199@gmail.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUd43f7996b93c: Partial merge to 2.6.2rc1 : Merge commit '99c1019' into next
rPU66cf3a925b4b: Fix #4226 - Prepend 'Puppet CA: ' to fqdn for default root ca_name

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPU1a00c07971c4: Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next (authored by Jesse Wolfe <jes5199@gmail.com>).Oct 4 2010, 9:22 PM

Merged Changes

66cf3a925b4b Fix #4226 - Prepend 'Puppet CA: ' to fqdn for default root ca_name
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
d54352a0cc30 Port Puppet::SSLCertificates::CA test to rspec
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
effc6b8e2929 Fixes #4852 - error messages involving Whits now mention Classes instead
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
3f99bd71811b Fix #4267 - Create a backup before dropping permissions
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6468f4ede9d9 (#4763) Don't call a method that was removed in Rails 3 activerecord
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
79d5fde2246c Fixed #4763 - Hardcoded ActiveRecord version
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
4798df328526 Fixes #4822 -- Puppet doc -o option broken
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

lib/

puppet/

application.rb

defaults.rb

feature/

rails.rb

provider/

ssh_authorized_key/

parsed.rb

rails.rb

reference/

type.rb

ssl/

certificate_request.rb

sslcertificates/

ca.rb

type/

whit.rb

util.rb

spec/

integration/

application/

unit/

type/

test/

certmgr/

ca.rb

rPU1a00c07971c4

View Options

lib/puppet/application.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/feature/rails.rb

View Options

lib/puppet/provider/ssh_authorized_key/parsed.rb

View Options

lib/puppet/rails.rb

View Options

lib/puppet/reference/type.rb

View Options

lib/puppet/ssl/certificate_request.rb

View Options

lib/puppet/sslcertificates/ca.rb

View Options

lib/puppet/type/whit.rb

View Options

lib/puppet/util.rb

View Options

spec/integration/application/doc_spec.rb

View Options

spec/integration/defaults_spec.rb

View Options

spec/unit/application_spec.rb

View Options

spec/unit/rails_spec.rb

View Options

spec/unit/sslcertificates/ca_spec.rb

View Options

spec/unit/type/whit_spec.rb

View Options

Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next1a00c07971c4UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (18)

rPU1a00c07971c4

lib/puppet/application.rb

lib/puppet/defaults.rb

lib/puppet/feature/rails.rb

lib/puppet/provider/ssh_authorized_key/parsed.rb

lib/puppet/rails.rb

lib/puppet/reference/type.rb

lib/puppet/ssl/certificate_request.rb

lib/puppet/sslcertificates/ca.rb

lib/puppet/type/whit.rb

lib/puppet/util.rb

spec/integration/application/doc_spec.rb

spec/integration/defaults_spec.rb

spec/unit/application_spec.rb

spec/unit/rails_spec.rb

spec/unit/sslcertificates/ca_spec.rb

spec/unit/type/whit_spec.rb

test/certmgr/ca.rb

Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next
1a00c07971c4Unpublished
Actions