HomePhorge

Merge branch 'feature/13970/remove-dynamic-scoping' from zaphod42
b5847f4b2d6aUnpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'feature/13970/remove-dynamic-scoping' from zaphod42

Conflicts:
lib/puppet/parser/scope.rb
spec/unit/parser/scope_spec.rb

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPUb5847f4b2d6a: Merge branch 'feature/13970/remove-dynamic-scoping' from zaphod42 (authored by Daniel Pittman <daniel@puppetlabs.com>).Apr 27 2012, 3:07 AM