diff options
| author | Luke Kanies <luke@madstop.com> | 2008-06-16 10:56:55 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-06-16 10:56:55 -0500 |
| commit | 49016bb29312bfeb6f41ce420159e6ffc477eebe (patch) | |
| tree | 7ce6fcf5f2c37519617915a3e79d487bdf5296ce /spec/unit/node | |
| parent | 6b69a86e48be082a6d03ce69f2700c4c874e222f (diff) | |
| parent | 5273b22b4fda6f9aa7a8366a1dfbae092594d391 (diff) | |
| download | puppet-49016bb29312bfeb6f41ce420159e6ffc477eebe.tar.gz puppet-49016bb29312bfeb6f41ce420159e6ffc477eebe.tar.xz puppet-49016bb29312bfeb6f41ce420159e6ffc477eebe.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
lib/puppet/defaults.rb
spec/integration/defaults.rb
Diffstat (limited to 'spec/unit/node')
0 files changed, 0 insertions, 0 deletions