diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-08-15 10:36:03 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-08-15 10:36:03 -0700 |
| commit | e7d5c7c1cd4109d7bb061a503f5da8777a1be66d (patch) | |
| tree | 6aace815f8c3fe30d4ad7eefbda8af141b78482f /test/util/autoload.rb | |
| parent | a71573cb32f01e5bf5f1a5030c6a291ce5b63370 (diff) | |
| parent | fa1ec4dd93f015c2943271c9ae107991c6d3c90e (diff) | |
| download | puppet-e7d5c7c1cd4109d7bb061a503f5da8777a1be66d.tar.gz puppet-e7d5c7c1cd4109d7bb061a503f5da8777a1be66d.tar.xz puppet-e7d5c7c1cd4109d7bb061a503f5da8777a1be66d.zip | |
Merge branch '2.7.x'
* 2.7.x: (25 commits)
(#4411) Explain that runinterval = 0 does not mean "never run"
Maint: Fix missing option text in puppet agent and arrange options alphabetically
(#8302) Improve documentation of exec providers
(#7853) Clarify and complete docs for the tagmail report processor
Maint: Mention that audit metaparameter will accept "all"
Maint: Adjust wording for file type's content parameter
Maint: Fix poor documentation for versioncmp function.
maint: Fix case sensitive require
maint: Add inspect app options to help
maint: Fix inspect help
Increment lib/puppet.rb VERSION string
Updated CHANGELOG for 2.7.3rc1
(#4762) Ensure that clients on the moon can successfully connect.
Add document outlining preferred contribution methods
Add document outlining preferred contribution methods
Add document outlining preferred contribution methods
Revert "Merge branch 'vcsrepo'"
Revert "Merge branch 'vcsrepo'"
Updating CHANGELOG for 2.7.2rc3
(#8704) Give better errors for invalid fileserver.conf
...
Manually Resolved Conflicts:
lib/puppet/parser/functions/versioncmp.rb
spec/integration/node/facts_spec.rb
Diffstat (limited to 'test/util/autoload.rb')
0 files changed, 0 insertions, 0 deletions