HomePhorge
Diffusion puppet 9caa04fd3635

Merge branch '0.25.x' into next
9caa04fd3635Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '0.25.x' into next

This is a housekeeping merge: all 0.25.x commits were already
cherry-picked into the 2.6 era's master.
No code was changed by this merge, since I used --strategy=ours

Details

Provenance
Jesse Wolfe <jes5199@gmail.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU83d9874e2eba: Use the name in the search path for looking for metadata
rPU8747479d59fa: Updated CHANGELOG for 2.6.0rc2
Branches
Unknown
Tags
Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPU9caa04fd3635: Merge branch '0.25.x' into next (authored by Jesse Wolfe <jes5199@gmail.com>).Jul 13 2010, 2:52 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Empty Commit

This commit is empty and does not affect any paths.