diff options
| author | Markus Roberts <Markus@reality.com> | 2010-02-09 15:17:53 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-02-09 15:17:53 -0800 |
| commit | 27322e5460130b854835aef56ab7076bab83a00b (patch) | |
| tree | b69501ce3c7fd616880f60999ad38304a40abba2 /lib/puppet/node | |
| parent | 70c71c58c1dd038d033d5fdd3fecc8f15b11fd52 (diff) | |
| parent | 71653a74d91b1e6e9845b4a41249861319c0d6b0 (diff) | |
| download | puppet-27322e5460130b854835aef56ab7076bab83a00b.tar.gz puppet-27322e5460130b854835aef56ab7076bab83a00b.tar.xz puppet-27322e5460130b854835aef56ab7076bab83a00b.zip | |
Merge branch '0.25.x'
Conflicts:
lib/puppet/agent.rb
lib/puppet/application/puppet.rb
lib/puppet/configurer.rb
man/man5/puppet.conf.5
spec/integration/defaults.rb
spec/unit/configurer.rb
Diffstat (limited to 'lib/puppet/node')
0 files changed, 0 insertions, 0 deletions