HomePhorge
Diffusion puppet c6e824ad5144

Partial merge to 2.6.2rc1 : Merge commit 'f950061' into next
c6e824ad5144Unpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Partial merge to 2.6.2rc1 : Merge commit 'f950061' into next

Some specs were in conflict, as they had been recently modified to use
the API functionality that f950061 removes. This merge commit simply
restores the verson of those specs from f950061.

Manually Resolved Conflicts:
spec/unit/dsl/resource_type_api_spec.rb

Details

Provenance
Jesse Wolfe <jes5199@gmail.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU2e189d516643: Partial merge to 2.6.2rc1 : Merge commit '8ff4b9a' into next
rPUf95006148c3a: [#4716] ResourceTypeAPI exposes implementation details that are likely to change
Branches
Unknown
Tags
Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPUc6e824ad5144: Partial merge to 2.6.2rc1 : Merge commit 'f950061' into next (authored by Jesse Wolfe <jes5199@gmail.com>).Oct 2 2010, 10:09 AM

Merged Changes

Changes (6)

PathSize
lib/
puppet/
dsl/
parser/
spec/
integration/
parser/
unit/
dsl/
parser/

rPUc6e824ad5144

View Options

lib/puppet/dsl.rb

Loading...
View Options

lib/puppet/dsl/resource_type_api.rb

Loading...
View Options

lib/puppet/parser/parser_support.rb

Loading...
View Options

spec/integration/parser/ruby_manifest_spec.rb

Loading...
View Options

spec/unit/dsl/resource_type_api_spec.rb

Loading...
View Options

spec/unit/parser/parser_spec.rb

Loading...