HomePhorge
Diffusion puppet 520cbc0292ec

Merge branch '2.7.x'
520cbc0292ecUnpublished
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
Daniel Pittman <daniel@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU78657fcd7f77: Merge branch '2.6.x' into 2.7.x
rPU4d6703ca2eb2: Merge branch 'test/2.6.x/4123'
Branches
Unknown
Tags
Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU520cbc0292ec: Merge branch '2.7.x' (authored by Daniel Pittman <daniel@puppetlabs.com>).May 25 2011, 11:25 PM

Merged Changes

Changes (2)

PathSize
spec/
integration/
util/
unit/
type/

rPU520cbc0292ec

View Options

spec/integration/util/file_locking_spec.rb

Loading...
View Options

spec/unit/type/schedule_spec.rb

Loading...