puppet.git/lib/puppet/parser, branch ticket/master/7841

Merge branch '2.7.x'

2011-08-24T22:42:03+00:00

Conflicts:
	lib/puppet/feature/base.rb
	lib/puppet/file_serving/configuration.rb
	spec/unit/indirector/ssl_file_spec.rb
	spec/unit/parser/functions/extlookup_spec.rb
	spec/unit/resource/catalog_spec.rb
	test/language/ast/variable.rb

(#8268) Require windows drive letters in absolute file paths

2011-08-19T20:48:29+00:00

When testing whether a file path is absolute, the regexp was only
handling POSIX style file paths. This commit requires Windows
style file paths to start with a drive letter. A future commit
will refacter the various places we do path validation to
support both Windows drive letters and UNC paths.

Reviewed-by: Jacob Helwig 
(cherry picked from commit 45ae5b4a9ced26dfcd3e324391f9a26cb02bf93d)

Merge pull request #48 from daniel-pittman/maint/2.7.x/strip-incorrect-rights-statements

2011-08-19T00:09:33+00:00

Maint/2.7.x/strip incorrect rights statements

Maint: Fix line wrapping in create_resources function

2011-08-18T22:12:28+00:00

This is a cosmetic commit improving the line wrapping in the create_resources
function's documentation string.

maint: remove inaccurate copyright and license statements.

2011-08-18T18:27:41+00:00

For a while Luke, and other authors, injected a created tag, copyright
statement, and "All rights reserved" into every new file they added to the
Puppet project.

This isn't really true, and we have a global license covering the code, so
we have now stripped out all those old tags.

Signed-off-by: Daniel Pittman

Maint: Improve create_resources function's doc string

2011-08-18T00:51:34+00:00

The create_resources function's doc string was not particularly clear and had
incorrect markdown formatting. This commit adds a more complete example which
demonstrates the necessary hash format, and changes the doc string to a
heredoc to simplify escaping.

Merge branch '2.7.x'

2011-08-15T17:36:03+00:00

* 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

(#8814) Update fqdn_rand for ruby 1.9.2 rand bug.

2011-08-12T03:18:48+00:00

Ruby 1.9.2 does not accept a string for rand function, so rand('1')
fails even though this works in Ruby 1.8.x and the string is implicitly
converted to a number. We added to_i to avoid this bug.

Maint: Fix poor documentation for versioncmp function.

2011-08-09T22:56:45+00:00

The versioncmp function's documentation was missing punctuation and was
unnecessarily vague. This commit clarifies the return data and makes the
documentation more legible at a glance.

Merge branch '2.7rc' into 2.7.x

2011-07-25T21:35:35+00:00