diff options
| author | Luke Kanies <luke@madstop.com> | 2007-09-22 15:04:34 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-09-22 15:04:34 -0500 |
| commit | d6e91ae78698bdbec818d383574f4c279735e172 (patch) | |
| tree | 7072c2a71ef1c05c6a46b6050f52bf3d01ae2843 /lib/puppet/util/autoload.rb | |
| parent | a66699596452f88d2bc467af4cff3f9a1aec3d1e (diff) | |
| parent | 86dde63473d29c45d8698ce4edd53c820a621362 (diff) | |
| download | puppet-d6e91ae78698bdbec818d383574f4c279735e172.tar.gz puppet-d6e91ae78698bdbec818d383574f4c279735e172.tar.xz puppet-d6e91ae78698bdbec818d383574f4c279735e172.zip | |
Merge branch 'configurations' into indirection
Conflicts:
lib/puppet/defaults.rb
lib/puppet/indirector/facts/yaml.rb
spec/unit/indirector/indirection.rb
spec/unit/indirector/indirector.rb
Diffstat (limited to 'lib/puppet/util/autoload.rb')
0 files changed, 0 insertions, 0 deletions