Diffusion puppet 669fd0ec917d

Merge branch 'master' into puppet-4
669fd0ec917dUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into puppet-4

master: (maint) use $ruby_arch only if it has been set

Details

Provenance

Josh Partlow <joshua.partlow@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU891f0bc3c040: Merge pull request #2923 from adrienthebo/maint/puppet-4/remove-unused-munger
rPU682c4713c206: Merge pull request #2922 from rji/qeng-1013/master/modify-acceptance-script

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Partlow <joshua.partlow@puppetlabs.com> committed rPU669fd0ec917d: Merge branch 'master' into puppet-4 (authored by Josh Partlow <joshua.partlow@puppetlabs.com>).Jul 31 2014, 8:02 PM

Merged Changes

682c4713c206 Merge pull request #2922 from rji/qeng-1013/master/modify-acceptance-script
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
f8926f78be74 (maint) use $ruby_arch only if it has been set
Author
Roger Ignazio <roger@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (1)

Path

Size

acceptance/

bin/

ci-bootstrap-from-artifacts.sh

rPU669fd0ec917d

acceptance/bin/ci-bootstrap-from-artifacts.sh

Loading...