HomePhorge
Diffusion puppet bade826e0a94

Merge branch 'stable'
bade826e0a94Unpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

Conflicts:
acceptance/config/nodes/solaris10.yaml
acceptance/config/nodes/solaris11.yaml

Details

Provenance
Kylo Ginsberg <kylo@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU1509e11fd6d5: Merge pull request #3394 from rji/maint/stable/el6-masters-for-win-sol-agents
rPUc51195156c20: Merge branch 'stable'
Branches
Unknown
Tags
Unknown

Event Timeline

Kylo Ginsberg <kylo@puppetlabs.com> committed rPUbade826e0a94: Merge branch 'stable' (authored by Kylo Ginsberg <kylo@puppetlabs.com>).Dec 10 2014, 7:00 AM

Merged Changes

Empty Commit

This commit is empty and does not affect any paths.