diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-04-21 14:23:38 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-04-21 14:23:38 -0700 |
| commit | e396d8042c83ab0f02a4ad159f47db0003959393 (patch) | |
| tree | 66c3ab1e7b6965f068938d338a929fde74849ecb /lib/puppet/interface/documentation.rb | |
| parent | 7b0cf6dc3e4165733195b1645e2c4542c340feb6 (diff) | |
| parent | 0b9c7adce13cad4325d514f9d97562364042319c (diff) | |
| download | puppet-e396d8042c83ab0f02a4ad159f47db0003959393.tar.gz puppet-e396d8042c83ab0f02a4ad159f47db0003959393.tar.xz puppet-e396d8042c83ab0f02a4ad159f47db0003959393.zip | |
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
Diffstat (limited to 'lib/puppet/interface/documentation.rb')
0 files changed, 0 insertions, 0 deletions