Diffusion puppet 486182620533

Merge branch 'stable'
486182620533Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

Conflicts:
lib/puppet/application.rb

Details

Provenance

Henrik Lindberg <henrik.lindberg@cloudsmith.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU0dc5ad3da230: Merge pull request #2664 from zaphod42/issue/stable/pup-2610-rack-fails-to…
rPU38d6295a8fac: Merge remote-tracking branch 'upstream/stable'

Branches

Unknown

Tags

Unknown

Event Timeline

Henrik Lindberg <henrik.lindberg@cloudsmith.com> committed rPU486182620533: Merge branch 'stable' (authored by Henrik Lindberg <henrik.lindberg@cloudsmith.com>).May 19 2014, 2:44 PM

Merged Changes

Changes (5)

Path

Size

lib/

puppet/

test/

spec/

unit/

context_spec.rb

rPU486182620533

View Options

lib/puppet.rb

View Options

lib/puppet/application.rb

View Options

lib/puppet/context.rb

View Options

lib/puppet/test/test_helper.rb

View Options

Merge branch 'stable'486182620533UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (5)

rPU486182620533

lib/puppet.rb

lib/puppet/application.rb

lib/puppet/context.rb

lib/puppet/test/test_helper.rb

spec/unit/context_spec.rb

Merge branch 'stable'
486182620533Unpublished
Actions