Diffusion puppet 8eb9557420bd

Merge branch 'stable'
8eb9557420bdUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

Conflicts:
lib/puppet/parser/scope.rb
lib/puppet/type/package.rb
spec/unit/type/package_spec.rb

Changed be_true matcher to be_truthy because of rspec version change

Details

Provenance

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

Parents

rPU11bba864938b: Merge pull request #3681 from whopper/PUP-4076/remove_allow_virtual_warning_3.x
rPU0abb9a9c13d5: Merge pull request #3679 from haus/ticket/master/pup-4074

Branches

Unknown

Tags

Unknown

Event Timeline

Henrik Lindberg <henrik.lindberg@cloudsmith.com> committed rPU8eb9557420bd: Merge branch 'stable' (authored by Henrik Lindberg <henrik.lindberg@cloudsmith.com>).Mar 5 2015, 10:50 PM

Merged Changes

Changes (5)

Path

Size

lib/

puppet/

parser/

scope.rb

pops/

evaluator/

evaluator_impl.rb

spec/

unit/

parser/

functions/

defined_spec.rb

pops/

evaluator/

evaluating_parser_spec.rb

type/

package_spec.rb

rPU8eb9557420bd

View Options

lib/puppet/parser/scope.rb

View Options

lib/puppet/pops/evaluator/evaluator_impl.rb

View Options

spec/unit/parser/functions/defined_spec.rb

View Options

spec/unit/pops/evaluator/evaluating_parser_spec.rb

View Options

spec/unit/type/package_spec.rb

Merge branch 'stable'8eb9557420bdUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (5)

rPU8eb9557420bd

lib/puppet/parser/scope.rb

lib/puppet/pops/evaluator/evaluator_impl.rb

spec/unit/parser/functions/defined_spec.rb

spec/unit/pops/evaluator/evaluating_parser_spec.rb

spec/unit/type/package_spec.rb

Merge branch 'stable'
8eb9557420bdUnpublished
Actions