diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 12:02:21 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 12:02:21 -0700 |
| commit | 058cc39227112cefc637d38fd67d471945b2d4aa (patch) | |
| tree | 9bb4a6f963f973b439e0dbe5c348e9497aef06fe /lib/puppet/interface/documentation.rb | |
| parent | f80afbe72b848fe4ed81d8116d4eeb494aa6f61e (diff) | |
| parent | 1f438da968e1583d900903407c2e5b17648fa937 (diff) | |
| download | puppet-058cc39227112cefc637d38fd67d471945b2d4aa.tar.gz puppet-058cc39227112cefc637d38fd67d471945b2d4aa.tar.xz puppet-058cc39227112cefc637d38fd67d471945b2d4aa.zip | |
Merge branch '2.6.x' into 2.7.next
Fix conflicts in the changelog, and one agent spec in favour of the 2.7.next
version of the code.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
Diffstat (limited to 'lib/puppet/interface/documentation.rb')
0 files changed, 0 insertions, 0 deletions