Merge branch '2.6.next' into 2.7.next
Manually resolved conflicts:
lib/puppet/parser/resource.rb
lib/puppet/parser/scope.rb
spec/unit/parser/scope_spec.rb
Merge branch '2.6.next' into 2.7.next e396d8042c83Unpublished
Tags None Referenced Files None Subscribers None
Description Merge branch '2.6.next' into 2.7.next Manually resolved conflicts:
Details
Event TimelineJosh Cooper <josh@puppetlabs.com> committed rPUe396d8042c83: Merge branch '2.6.next' into 2.7.next (authored by Josh Cooper <josh@puppetlabs.com>).Apr 21 2011, 11:23 PM2011-04-21 23:23:38 (UTC+2)
Merged Changes
Changes (113) Very Large CommitThis commit is very large. Load each file individually.
rPUe396d8042c83 acceptance/pending/ticket_4151_defined_function_should_not_return_true_for_unrealized_virtual_resources.rbacceptance/tests/ticket_4287_undefined_method_evaluate_match_when_function_call_used_in_an_if_statement.rb |