Merge branch '2.6.x' into next

* 2.6.x: (46 commits)
  Augmentation of tests for prior commit
  Fix to fix for #5755 -- backref serialization issues in zaml
  Fixed #5564 - Added some more fqdn_rand documentation
  Fixed #4968 - Updated list of options turned on by --test in documentation
  (#5061) - allow special hostclass/define variables to be evaluated as defaults.
  (#6107) Fix an error when auditing a file with empty content
  Remove already initialized constant warning from file_spec.rb tests
  (#5566) Treat source only File checksums as syntax errors when used with content
  Rename variable used in File type validation to be more clear
  Remove invalid "timestamp" and "time", and add missing "ctime" File checksum types.
  Remove order dependency when specifying source and checksum on File type
  Bug #5755 -- ZAML generates extra newline in some hash backreferences.
  bug #5681 -- code fix to handle AIX mount output
  Bug #5681 -- parse AIX mount command output.
  Spec for #5681 to allow parsing of AIX mount output in mount provider
  Fixed #6091 - Changed POSIX path matching to allow multiple leading slashes
  Bug #6091 -- test leading double-slash in filenames are allowed.
  Fixed #6071 - Fixed typo and improved exec path error message
  Fixed #6061 - Allowed -1 as password min/max age
  Bug #6061 -- verify that negative {min,max}_password_age are accepted.
  ...

Manually Resolved Conflicts:
	lib/puppet/util/zaml.rb
	spec/unit/util/zaml_spec.rb

3 files changed, 52 insertions, 12 deletions

diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
index c60e1d4fb..fdabd05c9 100644
--- a/lib/puppet/parser/compiler.rb
+++ b/lib/puppet/parser/compiler.rb
@@ -139,12 +139,23 @@ class Puppet::Parser::Compiler
   def evaluate_classes(classes, scope, lazy_evaluate = true)
     raise Puppet::DevError, "No source for scope passed to evaluate_classes" unless scope.source
     found = []
+    param_classes = nil
+    # if we are a param class, save the classes hash
+    # and transform classes to be the keys
+    if classes.class == Hash
+      param_classes = classes
+      classes = classes.keys
+    end
     classes.each do |name|
       # If we can find the class, then make a resource that will evaluate it.
       if klass = scope.find_hostclass(name)
-        found << name and next if scope.class_scope(klass)
 
-        resource = klass.ensure_in_catalog(scope)
+        if param_classes
+          resource = klass.ensure_in_catalog(scope, param_classes[name] || {})
+        else
+          found << name and next if scope.class_scope(klass)
+          resource = klass.ensure_in_catalog(scope)
+        end
 
         # If they've disabled lazy evaluation (which the :include function does),
         # then evaluate our resource immediately.
@@ -432,7 +443,11 @@ class Puppet::Parser::Compiler
     @resources = []
 
     # Make sure any external node classes are in our class list
-    @catalog.add_class(*@node.classes)
+    if @node.classes.class == Hash
+      @catalog.add_class(*@node.classes.keys)
+    else
+      @catalog.add_class(*@node.classes)
+    end
   end
 
   # Set the node's parameters into the top-scope as variables.
diff --git a/lib/puppet/parser/functions/defined.rb b/lib/puppet/parser/functions/defined.rb
index 90632af2f..2aeaa9ba0 100644
--- a/lib/puppet/parser/functions/defined.rb
+++ b/lib/puppet/parser/functions/defined.rb
@@ -1,10 +1,32 @@
 # Test whether a given class or definition is defined
-Puppet::Parser::Functions::newfunction(:defined, :type => :rvalue, :doc => "Determine whether a given
-  type is defined, either as a native type or a defined type, or whether a class is defined.
-  This is useful for checking whether a class is defined and only including it if it is.
-  This function can also test whether a resource has been defined, using resource references
-  (e.g., `if defined(File['/tmp/myfile']) { ... }`).  This function is unfortunately
-  dependent on the parse order of the configuration when testing whether a resource is defined.") do |vals|
+Puppet::Parser::Functions::newfunction(:defined, :type => :rvalue, :doc => "Determine whether
+  a given class or resource type is defined. This function can also determine whether a
+  specific resource has been declared. Returns true or false. Accepts class names,
+  type names, and resource references.
+
+  The `defined` function checks both native and defined types, including types
+  provided as plugins via modules. Types and classes are both checked using their names:
+
+      defined(\"file\")
+      defined(\"customtype\")
+      defined(\"foo\")
+      defined(\"foo::bar\")
+
+  Resource declarations are checked using resource references, e.g.
+  `defined( File['/tmp/myfile'] )`. Checking whether a given resource
+  has been declared is, unfortunately, dependent on the parse order of
+  the configuration, and the following code will not work:
+
+      if defined(File['/tmp/foo']) {
+          notify(\"This configuration includes the /tmp/foo file.\")
+      }
+      file {\"/tmp/foo\":
+          ensure => present,
+      }
+
+  However, this order requirement refers to parse order only, and ordering of
+  resources in the configuration graph (e.g. with `before` or `require`) does not
+  affect the behavior of `defined`.") do |vals|
     result = false
     vals = [vals] unless vals.is_a?(Array)
     vals.each do |val|
diff --git a/lib/puppet/parser/functions/fqdn_rand.rb b/lib/puppet/parser/functions/fqdn_rand.rb
index 3e7018ac4..52946f2c1 100644
--- a/lib/puppet/parser/functions/fqdn_rand.rb
+++ b/lib/puppet/parser/functions/fqdn_rand.rb
@@ -1,7 +1,10 @@
 Puppet::Parser::Functions::newfunction(:fqdn_rand, :type => :rvalue, :doc =>
-  "Generates random numbers based on the node's fqdn. The first argument
-  sets the range.  Additional (optional) arguments may be used to further
-  distinguish the seed.") do |args|
+  "Generates random numbers based on the node's fqdn. Generated random values
+  will be a range from 0 up to and excluding n, where n is the first parameter.
+  The second argument specifies a number to add to the seed and is optional, for example:
+
+      $random_number = fqdn_rand(30)
+      $random_number_seed = fqdn_rand(30,30)") do |args|
     require 'md5'
     max = args.shift
     srand MD5.new([lookupvar('fqdn'),args].join(':')).to_s.hex