diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-05 11:43:32 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-05 11:43:32 -0700 |
| commit | e6c829617ccc120e04f945e8714f792ce29c284d (patch) | |
| tree | 75718ca64fcc7699069f16a755141a676491a53f /lib/puppet/parser/ast/branch.rb | |
| parent | 7bdbd132634f61d91aeee401de15248d936ce71e (diff) | |
| parent | 6b278503021c4404904f56ced6995d0fbfa5b8fe (diff) | |
| download | puppet-e6c829617ccc120e04f945e8714f792ce29c284d.tar.gz puppet-e6c829617ccc120e04f945e8714f792ce29c284d.tar.xz puppet-e6c829617ccc120e04f945e8714f792ce29c284d.zip | |
Merge remote branch 'paul/ticket/next/4657' into next
This patch conflicts with a backport of itself. This merge resolution
favors the original patch for the code changes, and the 2.6.2 patch for
the specs.
Manually Resolved Conflicts:
lib/puppet/dsl/resource_type_api.rb
lib/puppet/parser/ast/definition.rb
lib/puppet/parser/parser_support.rb
spec/integration/parser/ruby_manifest_spec.rb
spec/unit/dsl/resource_type_api_spec.rb
Diffstat (limited to 'lib/puppet/parser/ast/branch.rb')
0 files changed, 0 insertions, 0 deletions