Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 3, 2011
  1. Merge branch 'next'

    Matt Robinson authored
    * next: (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.
      ...
  2. Merge branch '2.6.x' into next

    Matt Robinson authored
    * 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. Merge branch '2.6.next' into 2.6.x

    Matt Robinson authored
    * 2.6.next: (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.
      ...
Commits on Feb 2, 2011
  1. @MarkusQ
  2. @MarkusQ
  3. @MarkusQ

    Augmentation of tests for prior commit

    MarkusQ authored
    There is no good answer to tests that depend on the order of itteration over hashes.
  4. Merge remote branch 'bodepd/feature/2.6.4/5910' into 2.6.next

    Paul Berry authored
    * bodepd/feature/2.6.4/5910:
      (#5910) Improved logging when declared classes cannot be found:
  5. Merge branch 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet…

    Jacob Helwig authored
    … into 2.6.next
    
    * 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet:
      (#5913) Fix Puppet::Application.find constant lookup behavior
  6. @jes5199
  7. @jes5199
  8. Merge remote branch 'jamtur01/tickets/2.6.x/6071' into 2.6.next

    Jacob Helwig authored
    * jamtur01/tickets/2.6.x/6071:
      Fixed #6071 - Fixed typo and improved exec path error message
  9. @MarkusQ

    Fix to fix for #5755 -- backref serialization issues in zaml

    MarkusQ authored
    This commit addresses the original issue that the change reverted in the previous
    commit for #5755 was intended to fix by removing the special case on labels in
    emit (lables, even if they are never generated, are not "new lines" and thus
    @recent_nl should always be set to false when one is emitted).
    
    It also partially addresses a related issue wherein temporary strings generated
    when field names are constructed recycle their object_id (they are temporary)
    and thus cause incorrect back references.  This commit "fixes" the problem by
    never generating backrefs to strings (treating them as immutable).
    
    It does not address other suspected issues such as thread safety durring serialization
    due to the use of class variables to store the seen-object hash or the use of object
    ids as "permanently unique" identifiers.
    
    Paired with: Daniel Pittman
    Advice & Commiseration: Jesse Wolfe
  10. Merge branch 'tickets/2.6.x/5564' into 2.6.next

    Paul Berry authored
    * tickets/2.6.x/5564:
      Fixed #5564 - Added some more fqdn_rand documentation
  11. @jes5199
  12. @jamtur01

    Fixed #5564 - Added some more fqdn_rand documentation

    jamtur01 authored Paul Berry committed
    Reviewed-by: Paul Berry <paul@puppetlabs.com>
  13. Merge remote branch 'jamtur01/tickets/2.6.x/5736' into 2.6.next

    Jacob Helwig authored
    * jamtur01/tickets/2.6.x/5736:
      Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate description of --clean.
  14. Merge branch 'tickets/2.6.x/5167' into 2.6.next

    Matt Robinson authored
    * tickets/2.6.x/5167:
      Fixed #5167 - misleading documentation in the defaults of [main]
  15. @MarkusQ
  16. @jes5199
  17. Merge remote branch 'jamtur01/tickets/2.6.x/1657' into 2.6.next

    Jacob Helwig authored
    * jamtur01/tickets/2.6.x/1657:
      Fixed #1657 - Added note about target file
  18. Merge branch 'ticket/2.6.next/3165' into 2.6.next

    Paul Berry authored
    * ticket/2.6.next/3165:
      Fix #3165 Ralsh (bin/puppet resource) can't manage files
  19. Merge commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694' into 2.6.next

    Jacob Helwig authored
    * commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694':
      Fixed #4968 - Updated list of options turned on by --test in documentation
  20. @jamtur01

    Fixed #4968 - Updated list of options turned on by --test in document…

    jamtur01 authored Jacob Helwig committed
    …ation
    
    Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
    Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
  21. Merge branch 'feature/master/5061' into 2.6.next

    Paul Berry authored
    * feature/master/5061:
      (#5061) - allow special hostclass/define variables to be evaluated as defaults.
Commits on Feb 1, 2011
  1. Merge branch 'ticket/2.6.next/5045' into 2.6.next

    Matt Robinson authored
    * ticket/2.6.next/5045:
      (#5045) Cleaning up some tests and code
      (#5045) External node classifiers should be able to specify params for classes
      (#5045) Adds support to resource/type to also accept a param hash
  2. Merge branch 'tickets/2.6.x/2096' into 2.6.next

    Matt Robinson authored
    * tickets/2.6.x/2096:
      Fixed #2096 - clarified option modification and tested it is working
  3. @bodepd

    (#5061) - allow special hostclass/define variables to be evaluated as…

    bodepd authored Paul Berry committed
    … defaults.
    
    I have always been annoyed that special variables for defines and hostclasses can not be evaluated as param defaults. Special variables are: $name, $title, $module_name.
    
    Code example:
    class x (
      foo = $name
      ) { notice($foo)}
    
    should print x, and with my patch, it does.
    
    Reviewed-by: Paul Berry <paul@puppetlabs.com>
  4. Merge branch 'ticket/2.6.next/6107' into 2.6.next

    Matt Robinson authored
    * ticket/2.6.next/6107:
      (#6107) Fix an error when auditing a file with empty content
  5. (#6107) Fix an error when auditing a file with empty content

    Matt Robinson authored
    The manifest:
    
    file { "/tmp/foo" :
      ensure => present,
      audit => content,
    }
    
    produced the error:
    
    err: /Stage[main]//File[/tmp/foo]/ensure: change from absent to present
    failed: Could not retrieve content for from filebucket: private method `sub' called for nil:NilClass at
    /Users/matthewrobinson/work/puppet/test.pp:4
    
    This was due to logic in content assuming that if you didn't specify
    content while you were auditing it you must have specified a source.
    
    The code paths in the file type badly need a cleanup so that these sorts
    of errors aren't so difficult to track down and things are easier to
    test.
    
    Paired-with: Daniel Pittman
  6. Merge branch 'issues/2.6.next/5566' into 2.6.next

    Jacob Helwig authored
    * issues/2.6.next/5566:
      Remove already initialized constant warning from file_spec.rb tests
  7. Remove already initialized constant warning from file_spec.rb tests

    Jacob Helwig authored
    rspec pulls constants from the implementation into the test, so we don't
    need to redefine it.
    
    Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
  8. Merge branch 'issues/2.6.next/5566' into 2.6.next

    Jacob Helwig authored
    * issues/2.6.next/5566:
      (#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
  9. (#5566) Treat source only File checksums as syntax errors when used w…

    Jacob Helwig authored
    …ith content
    
    Certain checksum types (ctime, mtime) only make sense when used with the
    'source' File parameter, since there is no way to check them on raw
    strings.
    
    Given the limitations of the current checksumming implementations, it is
    likely to introduce unexpected behavior when using the 'none' checksum
    type and either one of the 'source', and 'content' File parameters.
    Because of this, it is now a syntax error to use a checksum of 'none' with
    either parameter.
    
    Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
  10. Rename variable used in File type validation to be more clear

    Jacob Helwig authored
    The 'count' variable is used to keep track of how many 'creator'
    parameters are set on the Type in order to raise an exception if this is
    greater than one.  Be explicit about this.
    
    Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
  11. Remove invalid "timestamp" and "time", and add missing "ctime" File c…

    Jacob Helwig authored
    …hecksum types.
    
    'timestamp', and 'time' have been invalid since well before 2.6.0, so do
    not add them to the list of valid checksum types.
    
    'ctime' was missing from the list of valid checksum types, so add it.
    
    Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
Something went wrong with that request. Please try again.