HomePhorge
Diffusion puppet 0b0a9be25f95

Merge branch '2.7.x'
0b0a9be25f95Unpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Conflicts:
acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

Details

Provenance
Nick Lewis <nick@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPUd1c965a2e1dd: Make temporary auth.conf in acceptance test readable by Puppet
rPU649b3dc58349: Merge branch '2.7.x'
Branches
Unknown
Tags
Unknown

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPU0b0a9be25f95: Merge branch '2.7.x' (authored by Nick Lewis <nick@puppetlabs.com>).Jun 10 2011, 1:53 AM

Merged Changes

Changes (4)

PathSize
acceptance/
pending/
tests/

rPU0b0a9be25f95

View Options

acceptance/pending/ticket_3360_allow_duplicate_csr_with_option_set.rb

Loading...
View Options

acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb

Loading...
View Options

acceptance/tests/ticket_6734_6256_5530_5503.rb

Loading...
View Options

acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

Loading...