puppet.git - Puppet repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	New man pages for 2.6.0	James Turnbull	2010-07-15	1	-79/+146
\|
*	Update man pages and partial doc fix to #3491	James Turnbull	2010-02-17	1	-5/+21
\|
*	Merge branch '0.25.x'	Markus Roberts	2010-02-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \|	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
*	Fixed #3128 - Updated man pages and moved puppet.conf.8 to puppet.conf.5	James Turnbull	2010-02-09	1	-0/+1469