Permalink
Commits on Jun 29, 2011
  1. Merge branch '2.7.x'

    jhelwig committed Jun 29, 2011
    * 2.7.x:
      Update configurer_spec.rb to work with Ruby 1.8.5
  2. Update configurer_spec.rb to work with Ruby 1.8.5

    jhelwig committed Jun 29, 2011
    Ruby 1.8.5 doesn't have start_with? on String, so instead of checking
    the log message using start_with? we check using a regex.
    
    Reviewed-by: Nick Lewis <nick@puppetlabs.com>
  3. Merge branch '2.7.x'

    jhelwig committed Jun 29, 2011
    * 2.7.x: (23 commits)
      Clean up indentation, whitespace, and commented out code
      Remove order dependency from functions integration spec
      (#7956) Porting cron tests
      (#7956) Port resource acceptance tests
      (#8048) Gem install puppet no longer fails if rdoc enabled.
      Updating for 2.7.1 release.
      (#8048) Gem install puppet no longer fails if rdoc enabled.
      Readying for release of 2.6.9
      Updating CHANGELOG for 2.7.0
      (#6854) Update Red Hat spec file
      Bumping release in lib/puppet.rb and updating CHANGELOG.
      Bumping RPM spec file to 2.6.9rc1.
      (#7224) Reword 'hostname was not match' error message
      (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names
      (#7506) Organize READMEs; specify supported Ruby versions in README.md
      (#7506) Specify supported Ruby versions in README.md
      (#5641) Help text: document that puppet doc takes modulepath, manifestdir, and environment options
      (#6418) Make test 64118 more portable
      (#7127) Stop puppet if a prerun command fails
      Do not needlessly create multiple reports when creating a transaction
      ...
  4. Merge branch '2.6.x' into 2.7.x

    jhelwig committed Jun 29, 2011
    * 2.6.x:
      (#7956) Porting cron tests
      (#7956) Port resource acceptance tests
      Readying for release of 2.6.9
      (#6854) Update Red Hat spec file
      Bumping release in lib/puppet.rb and updating CHANGELOG.
      Bumping RPM spec file to 2.6.9rc1.
      (#7506) Organize READMEs; specify supported Ruby versions in README.md
      (#6418) Make test 64118 more portable
      (#7127) Stop puppet if a prerun command fails
      Do not needlessly create multiple reports when creating a transaction
      (#4416) Ensure types are providified after reloading
      (#4416) Always remove old provider before recreating it
      Cleanup indentation, comment, and unused code
    
    Conflicts:
    	CHANGELOG
    	README.md
    	conf/redhat/puppet.spec
    	lib/puppet.rb
    	lib/puppet/transaction.rb
    	spec/unit/configurer_spec.rb
    	spec/unit/transaction_spec.rb
Commits on Jun 28, 2011
  1. Merge branch 'template-not-defined-test-failure-2.7.x' into 2.7.x

    jhelwig committed Jun 28, 2011
    * template-not-defined-test-failure-2.7.x:
      Clean up indentation, whitespace, and commented out code
      Remove order dependency from functions integration spec
  2. Clean up indentation, whitespace, and commented out code

    jhelwig committed Jun 17, 2011
    The mis-indented code, extra newlines, and commented out code were
    noticed while investigating the order dependent test failure fixed in
    4365c8ba.
    
    Reviewed-by: Max Martin <max@puppetlabs.com>
  3. Remove order dependency from functions integration spec

    jhelwig committed Jun 17, 2011
    The test in spec/integration/parser/functions_spec.rb would fail when
    the spec tests were run in the order (among other orderings):
    
      spec/unit/parser/functions/tag_spec.rb
      spec/unit/parser/templatewrapper_spec.rb
      spec/integration/parser/functions_spec.rb
    
    There are tests that would cause the "template" function to be loaded
    into the root environment.
    Puppet::Parser::Functions.function("template") would then detect its
    presence and P::P::F.rmfunction("template") would fail since #function(...)
    looks in more than just the current environment to see if a function
    is defined, while #rmfunction(...) only looks in the current
    environment to see if a function can be removed.
    
    In the test ordering specified earlier, tag_spec.rb would load the
    "template" function, and templatewrapper_spec.rb would create a
    current environment that would mask the root environment for #rmfunction(...),
    but not for #function(...)
    
    Since #rmfunction(...) only looks in the current environment, we
    should be using #functions.include?("template") since that matches the
    check that #rmfunction(...) itself uses.
    
    Paired-with: Nick Lewis <nick@puppetlabs.com>
  4. Merge branch '2.6rc' into 2.6.x

    jhelwig committed Jun 28, 2011
    * 2.6rc:
      Readying for release of 2.6.9
Commits on Jun 27, 2011
  1. Merge branch 'ticket/2.6.x/7956' into 2.6.x

    Dominic Maraglia
    Dominic Maraglia committed Jun 27, 2011
  2. (#7956) Porting cron tests

    Dominic Maraglia
    Dominic Maraglia committed Jun 27, 2011
    Ported cron tests were still weak. Coverted tests to use
    Ruby asserts for better debugging of subsequent failures.
    
    Add stronger regex's to look for expected output when applying puppet
    resource manifests.
  3. Merge branch 'maint/2.6.x/add_ported_resources_tests_from_enterpise_d…

    Dominic Maraglia
    Dominic Maraglia committed Jun 27, 2011
    …ist' into 2.6.x
  4. (#7956) Port resource acceptance tests

    Dominic Maraglia
    Dominic Maraglia committed Jun 27, 2011
    Many of the Puppet resource acceptance tests were RHEL/Centos
    specifc.  These tests were ported under the enterptise-dist
    repo; move the tests into 2.6.x for merging.
Commits on Jun 22, 2011
  1. (#8048) Gem install puppet no longer fails if rdoc enabled.

    joshcooper committed Jun 22, 2011
    Pre-released versions of faces may have used the "desc" option, which
    was later changed to "description", and an alias provided for "desc". The
    previous fix for 8048 removed this backwards compatibility (since it was
    never released to customers). This commit fixes the test case that
    assumed the "desc" option was still available.
    
    Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
  2. Merging up 2.7.1

    stahnma committed Jun 22, 2011
  3. Updating for 2.7.1 release.

    stahnma committed Jun 22, 2011
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
  4. (#8048) Gem install puppet no longer fails if rdoc enabled.

    stahnma committed Jun 22, 2011
    Rdoc wouldn't parse lib/puppet/interface/options.rb
    The offending code has been removed.
    
    This was causing issues for users wishing to upgrade puppet,
    via gem or puppet.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
Commits on Jun 21, 2011
  1. Readying for release of 2.6.9

    stahnma committed Jun 21, 2011
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
Commits on Jun 17, 2011
  1. Merge branch 'template-not-defined-test-failure'

    jhelwig committed Jun 17, 2011
    * template-not-defined-test-failure:
      Clean up indentation, whitespace, and commented out code
      Remove order dependency from functions integration spec
  2. Clean up indentation, whitespace, and commented out code

    jhelwig committed Jun 17, 2011
    The mis-indented code, extra newlines, and commented out code were
    noticed while investigating the order dependent test failure fixed in
    4365c8ba.
    
    Reviewed-by: Max Martin <max@puppetlabs.com>
  3. Remove order dependency from functions integration spec

    jhelwig committed Jun 17, 2011
    The test in spec/integration/parser/functions_spec.rb would fail when
    the spec tests were run in the order (among other orderings):
    
      spec/unit/parser/functions/tag_spec.rb
      spec/unit/parser/templatewrapper_spec.rb
      spec/integration/parser/functions_spec.rb
    
    There are tests that would cause the "template" function to be loaded
    into the root environment.
    Puppet::Parser::Functions.function("template") would then detect its
    presence and P::P::F.rmfunction("template") would fail since #function(...)
    looks in more than just the current environment to see if a function
    is defined, while #rmfunction(...) only looks in the current
    environment to see if a function can be removed.
    
    In the test ordering specified earlier, tag_spec.rb would load the
    "template" function, and templatewrapper_spec.rb would create a
    current environment that would mask the root environment for #rmfunction(...),
    but not for #function(...)
    
    Since #rmfunction(...) only looks in the current environment, we
    should be using #functions.include?("template") since that matches the
    check that #rmfunction(...) itself uses.
    
    Paired-with: Nick Lewis <nick@puppetlabs.com>
  4. Updating CHANGELOG for 2.7.0

    stahnma committed Jun 17, 2011
Commits on Jun 15, 2011
  1. (#6854) Update Red Hat spec file

    tmzullinger committed Mar 25, 2011
    Sync the spec file with Fedora/EPEL and pull in the following changes:
    
    - Ensure %%pre exits cleanly
    - Fix License tag, puppet is now GPLv2 only
    - Properly restart puppet agent/master daemons on upgrades from 0.25.x
    - Require libselinux-utils when selinux support is enabled
    - Support tmpfiles.d for Fedora >= 15 (#656677)
  2. Bumping release in lib/puppet.rb and updating CHANGELOG.

    stahnma committed Jun 15, 2011
    This is for release 2.6.9rc1.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
  3. Bumping RPM spec file to 2.6.9rc1.

    stahnma committed Jun 15, 2011
    I will bump the RPM spec file for each release, that way
    as soon as we cut a release candidate, we won't get a patch
    that updates the spec.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
  4. (#7224) Reword 'hostname was not match' error message

    nicklewis committed Jun 14, 2011
    This error message is grammatically incorrect and unhelpful, so we replace it
    with a message that explains more correctly what went wrong and what was
    expected. This message happens when making an authenticated connection to a
    server where the certificate doesn't match its hostname. This happens in the
    REST terminuses, so we wrap their HTTP methods with a helper that will catch
    the appropriate SSLError and re-raise it with the better message stating the
    hostname used, and the list of hostnames that we were expecting it to be a part
    of.
    
    Unfortunately, because the certificate in question isn't available at error
    time, we have to use the Net::HTTP#verify_callback to capture it.
    
    Paired-With: Jacob Helwig <jacob@puppetlabs.com>
    Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com>
Commits on Jun 14, 2011
  1. (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternat…

    nicklewis committed Jun 14, 2011
    …e names
    
    Alternate names, if present, are specified in the subjectAltName extension of
    the certificate. The values are in the form:
    
    "DNS:alternate_name1, DNS:alternate_name2"
    
    This helper will retrieve the value of the subjectAltName extension and extract
    the alternate names, returning and empty list if the extension is absent. This
    will make it easier to access the entire list of possible names for a
    certificate, rather than just the common name; this is helpful for generating
    more detailed SSL error messages.
    
    Paired-With: Jacob Helwig <jacob@puppetlabs.com>
  2. (#7506) Organize READMEs; specify supported Ruby versions in README.md

    nfagerlund committed Jun 14, 2011
    The README was not specific enough about the current state of our Ruby support.
    This commit lays out our current status as discussed in issue #7506 and in
    greater detail on the internal mailing list around April 8, 2011 under the
    subject "Statler Ruby Versions Support."
    
    This commit also consolidates two redundant README files into one.
    
    Paired-With: Matt Robinson <matt@puppetlabs.com>
  3. (#7506) Specify supported Ruby versions in README.md

    nfagerlund committed Jun 14, 2011
    The README was not specific enough about the current state of our Ruby support.
    This commit lays out our current status as discussed in issue #7506 and in
    greater detail on the internal mailing list around April 8, 2011 under the
    subject "Statler Ruby Versions Support."
    
    Paired-With: Matt Robinson <matt@puppetlabs.com>
  4. (#5641) Help text: document that puppet doc takes modulepath, manifes…

    nfagerlund committed Jun 14, 2011
    …tdir, and environment options
    
    Puppet doc didn't have the usual subcommand caveat about configuration settings
    being valid command line options, nor did it explicitly call out the three
    settings that it actually cares about.
    
    I opted to do the latter, since the number of relevant settings was so small.
    Note that --environment is currently broken; this is filed as bug #7907.