diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-28 14:39:29 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-28 14:39:29 -0800 |
| commit | 1e5618c44f1c4ad14c7ba1b3981e950ce7182276 (patch) | |
| tree | e4770f5c660fd3dae47d6ef1324b514d726af263 /lib/facter/puppet_vardir.rb | |
| parent | 16fe71867c997dd24a34aa088def7a1fa4cb5051 (diff) | |
| parent | 2b7591896d790a17f902fbafc2aed8743dc674f2 (diff) | |
Merge branch '2.x' into 3.x
* 2.x:
Update Modulefile, CHANGELOG for 2.6.0
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'lib/facter/puppet_vardir.rb')
0 files changed, 0 insertions, 0 deletions