diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-04-20 15:55:29 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-04-20 15:55:29 -0700 |
| commit | 0b9c7adce13cad4325d514f9d97562364042319c (patch) | |
| tree | f772da027951451763c75cff95426ab8fcb08991 /lib/puppet/interface/documentation.rb | |
| parent | 6b18f8f01f12b6123f3c7eae58817b10d41b2391 (diff) | |
| parent | 34f9f41628273d1554760f85414eb326aaea605e (diff) | |
| download | puppet-0b9c7adce13cad4325d514f9d97562364042319c.tar.gz puppet-0b9c7adce13cad4325d514f9d97562364042319c.tar.xz puppet-0b9c7adce13cad4325d514f9d97562364042319c.zip | |
Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next
Diffstat (limited to 'lib/puppet/interface/documentation.rb')
0 files changed, 0 insertions, 0 deletions