Skip to content
Commits on Mar 8, 2012
  1. missing: )

    committed Mar 8, 2012
Commits on Mar 6, 2012
  1. @daniel-pittman

    Merge pull request #544 from pcarlisle/ticket/master/12763-reloadable…

    …-plugins
    
    Ticket/master/12763 reloadable plugins
    daniel-pittman committed Mar 6, 2012
  2. @pcarlisle

    Merge branch '2.7.x'

    * 2.7.x:
      (#10722) Add spec to verify that an error is logged on bad http
      (#10722) Refactor http_spec to use expectations
      Updating CHANGELOG for 2.7.12rc2
      (#7592) Remove redundant call to String#to_s
      (#11988) Work around Augeas reload bug when changing save modes
      (#11988) Don't overwrite symlinks in augeas provider
      (#8312) Fix zypper provider so ensure => 'latest' now works
      (#12844) Fix a unit test relating to lockfiles
      (#12914) Allow puppet to be interrupted while waiting for child
      (#12933) Better error message when agent is administratively disabled
      (#7592) Remove redundant call to String#to_s
      (#12844) Agent lockfiles: backwards compatibility with 2.7.10/2.7.11
      (#10722) Display errors on HTTP report submission failures
      Revert "Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x"
      Revert "(#12844) Backwards compatibility for 'puppet agent --enable'"
      (#11988) Work around Augeas reload bug when changing save modes
      (#11988) Don't overwrite symlinks in augeas provider
      (#12881) Fix cron type default name error on windows
      (#12844) Backwards compatibility for 'puppet agent --enable'
      (#8312) Fix zypper provider so ensure => 'latest' now works
    
    Conflicts:
    	lib/puppet/provider/augeas/augeas.rb
    	lib/puppet/reports/http.rb
    	lib/puppet/util/pidlock.rb
    	spec/unit/application/agent_spec.rb
    	spec/unit/provider/augeas/augeas_spec.rb
    	spec/unit/reports/http_spec.rb
    pcarlisle committed Mar 5, 2012
Commits on Mar 5, 2012
  1. @daniel-pittman

    Merge pull request #561 from pcarlisle/ticket/2.7.x/10722-error-on-ba…

    …d-http-response
    
    (#10722) report an error on bad HTTTP response to report submission
    daniel-pittman committed Mar 5, 2012
  2. @pcarlisle
  3. @pcarlisle
Commits on Mar 3, 2012
  1. @haus

    Merge branch '2.7rc' into 2.7.x

    haus committed Mar 3, 2012
  2. @haus

    Updating CHANGELOG for 2.7.12rc2

    haus committed Mar 3, 2012
  3. @joshcooper @haus

    (#7592) Remove redundant call to String#to_s

    Previously, the augeas provider made calls like the following:
    
     @aug.get(key).to_s
    
    Since the Augeas#get method returns a String not an array, the to_s
    call is redundant. (Note the #match method does return an array.)
    
    The augeas tests were stubbing the #get method to return an array in
    some places (and a string in others). Prior to 1.9.2, ruby will
    automatically convert ["foo"].to_s to "foo", so everything worked as
    expected. However, under 1.9.2, ["foo"].to_s becomes "[\"foo\"]".
    
    These failures weren't noticed earlier, because our 1.9.2@allFeatures
    jenkins nodes do not have ruby-augeas installed. In other words, tests
    that require Puppet.features.augeas? were never running in
    Jenkins. The recent change to improve augeas testing, removed the
    dependency on this feature being installed, so these tests started
    failing.
    
    This commit just removes the redundant call to String#to_s, and
    updates the spec tests to match what the Augeas#get method really
    returns.
    joshcooper committed with haus Dec 6, 2011
  4. @domcleal @haus

    (#11988) Work around Augeas reload bug when changing save modes

    After saving a file in one save mode and switching to another, Augeas realise
    to reload the file when Augeas#load is called again.  Work around this by
    explicitly reloading all files we saved while using the first save mode.
    domcleal committed with haus Mar 1, 2012
  5. @nicklewis @haus

    (#11988) Don't overwrite symlinks in augeas provider

    Previously, if not running with `force` set, we would try to write the
    file in SAVE_NEWFILE mode to create a <filename>.augnew file with the
    changes. We determined whether there were changes to be made based on
    that file (and used it to show a diff). When it came time to actually
    make the changes, we would simply move the .augnew file over the file
    being managed. Unfortunately, if the file being managed were a symlink,
    this would clobber it.
    
    There was a fallback path in the case of force (or older versions of
    augeas not supporting SAVE_NEWFILE) in which we would make the
    changes in SAVE_OVERWRITE mode as normal. Now, the behavior is a
    combination of the two; we still use SAVE_NEWFILE to determine whether
    changes need to be made and to show a diff, but then remove the .augnew
    file and always run again in SAVE_OVERWRITE mode to save the changes.
    This effectively delegates the behavior of preserving the file, etc.
    to augeas, so we don't duplicate effort or bugs.
    nicklewis committed with haus Feb 9, 2012
  6. @kbarber @haus

    (#8312) Fix zypper provider so ensure => 'latest' now works

    Previously the regular expression to match the correct column from
    'zypper list-updates' was wrong, it seems to have been based on the command
    'zypper packages' instead. This was caused ensure => 'latest' to fail as the
    provider couldn't adequately figure out what newer versions were actually
    availabe.
    
    So I've fixed the regular expression (based on Felix Frank's patch) and updated
    the spec test so that it uses the real output from zypper list-updates and now
    references an external spec file, as apposed to referencing the content inline.
    kbarber committed with haus Feb 28, 2012
  7. @haus

    Merge pull request #559 from cprice-puppet/bug/2.7.x/12844-agent-enab…

    …le-doesnt-remove-old-lockfile
    
    Bug/2.7.x/12844 agent enable doesnt remove old lockfile
    haus committed Mar 3, 2012
  8. @cprice404

    (#12844) Fix a unit test relating to lockfiles

    The recent changes to support backwards compatibility with 2.7.10
    and 2.7.11 introduced a very minor change in behavior with regards
    to when a stale lockfile gets cleaned up.  Fixed this test to
    recognize the change.
    cprice404 committed Mar 3, 2012
  9. @daniel-pittman

    Merge pull request #556 from joshcooper/ticket/2.7.x/12914-poll-child

    (#12914) Allow puppet to be interrupted while waiting for child process
    daniel-pittman committed Mar 2, 2012
  10. @daniel-pittman

    Merge pull request #551 from cprice-puppet/bug/2.7.x/12844-agent-enab…

    …le-doesnt-remove-old-lockfile
    
    Bug/2.7.x/12844 agent enable doesnt remove old lockfile
    daniel-pittman committed Mar 2, 2012
  11. @joshcooper

    (#12914) Allow puppet to be interrupted while waiting for child

    Previously, puppet on Windows could not be interrupted, e.g. Ctrl-C,
    while waiting for a child process it executed to exit. For example,
    when executing a pre/post run command.
    
    This commit changes puppet to poll the state of the child process'
    handle, sleeping for 1 second in between.
    joshcooper committed Mar 2, 2012
Commits on Mar 2, 2012
  1. @cprice404

    (#12933) Better error message when agent is administratively disabled

    Detect the difference between the cases where an agent run is
    aborted due to another agent run already in progress vs. being
    aborted due to the agent being administratively disabled via
    '--disable', and print a more useful message for the latter case.
    cprice404 committed Mar 2, 2012
  2. @grimradical

    Merge pull request #552 from nicklewis/ticket/2.7.x/11988

    Ticket/2.7.x/11988 Augeas spec fixes on Ruby 1.9
    grimradical committed Mar 2, 2012
  3. @joshcooper @nicklewis

    (#7592) Remove redundant call to String#to_s

    Previously, the augeas provider made calls like the following:
    
     @aug.get(key).to_s
    
    Since the Augeas#get method returns a String not an array, the to_s
    call is redundant. (Note the #match method does return an array.)
    
    The augeas tests were stubbing the #get method to return an array in
    some places (and a string in others). Prior to 1.9.2, ruby will
    automatically convert ["foo"].to_s to "foo", so everything worked as
    expected. However, under 1.9.2, ["foo"].to_s becomes "[\"foo\"]".
    
    These failures weren't noticed earlier, because our 1.9.2@allFeatures
    jenkins nodes do not have ruby-augeas installed. In other words, tests
    that require Puppet.features.augeas? were never running in
    Jenkins. The recent change to improve augeas testing, removed the
    dependency on this feature being installed, so these tests started
    failing.
    
    This commit just removes the redundant call to String#to_s, and
    updates the spec tests to match what the Augeas#get method really
    returns.
    joshcooper committed with nicklewis Dec 6, 2011
  4. @cprice404

    (#12844) Agent lockfiles: backwards compatibility with 2.7.10/2.7.11

    In 2.7.10 there was a change in behavior introduced with regards
    to agent lockfiles.  Basically we split the concept of "an agent
    is currently running" apart from the concept of "the agent has
    been administratively disabled" by using 2 different lockfiles.
    
    That change was determined to have broken compatibility with
    mcollective, so it has been reverted as of 2.7.12.
    
    This commit provides backwards compatibility between 2.7.12+
    and 2.7.10/2.7.11 for cases where a user may have administratively
    disabled their agent and then upgraded to a newer version of puppet.
    cprice404 committed Mar 1, 2012
  5. @grimradical

    Merge pull request #546 from nicklewis/ticket/2.7.x/11988

    (#11988) Don't overwrite symlinks in augeas provider
    grimradical committed Mar 2, 2012
  6. @daniel-pittman

    Merge pull request #542 from jeffmccune/ticket/2.7rc/12881_fix_cron_m…

    …issing_provider_error_message
    
    (#12881) Fix cron type default name error on windows
    daniel-pittman committed Mar 2, 2012
  7. @nigelkersten @pcarlisle

    (#10722) Display errors on HTTP report submission failures

    We were failing silently if the report submission to http
    returned a non-200 response code.
    nigelkersten committed with pcarlisle Nov 10, 2011
  8. @cprice404

    Revert "Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' i…

    …nto 2.7.x"
    
    This reverts commit 86a806f, reversing
    changes made to ac81771.
    
    See tickets #3757, #12844, #4836, #11057.  These changes were deemed to
    be breaking public APIs, and thus are being reverted from 2.7.x.  They'll
    be reintroduced in 3.x.
    
    (The changes in question were relating to how puppet agent creates /
    manages its lockfiles.)
    
    Conflicts:
    
    	lib/puppet/util/pidlock.rb
    	spec/unit/agent_spec.rb
    	spec/unit/util/pidlock_spec.rb
    cprice404 committed Mar 1, 2012
Commits on Mar 1, 2012
  1. @cprice404

    Revert "(#12844) Backwards compatibility for 'puppet agent --enable'"

    This reverts commit fcac8f7, which
    was a backwards-compatibility workaround intended to handle some new
    behavior related to puppet agent lockfiles that was introduced in
    2.7.10.  The fix is being reverted because we've decided to remove
    the new lockfile behavior from the 2.7.x series entirely, and push
    it out to 3.x.
    cprice404 committed Mar 1, 2012
  2. @pcarlisle

    Merge pull request #549 from cprice-puppet/cleanup/master/ruby-185-ex…

    …ecution-spec-failures
    
    More fixes / cleanup for 1.8.5
    pcarlisle committed Mar 1, 2012
  3. @cprice404
  4. @domcleal @nicklewis

    (#11988) Work around Augeas reload bug when changing save modes

    After saving a file in one save mode and switching to another, Augeas realise
    to reload the file when Augeas#load is called again.  Work around this by
    explicitly reloading all files we saved while using the first save mode.
    domcleal committed with nicklewis Mar 1, 2012
  5. @pcarlisle

    Merge pull request #548 from cprice-puppet/cleanup/master/ruby-185-ex…

    …ecution-spec-failures
    
    Fix ruby 1.8.5 failures for execution_spec
    pcarlisle committed Feb 29, 2012
  6. @cprice404
Commits on Feb 29, 2012
  1. @daniel-pittman

    Merge pull request #547 from pcarlisle/ticket/master/12126-fix-ruby1.…

    …8.5-acceptance
    
    Ruby 1.8.5 fix for autoload and up2date
    daniel-pittman committed Feb 29, 2012
  2. @pcarlisle
  3. @pcarlisle

    (#12126) Fix autoload for ruby 1.8.5

    Don't use String.end_with.
    pcarlisle committed Feb 29, 2012
  4. @nicklewis

    (#11988) Don't overwrite symlinks in augeas provider

    Previously, if not running with `force` set, we would try to write the
    file in SAVE_NEWFILE mode to create a <filename>.augnew file with the
    changes. We determined whether there were changes to be made based on
    that file (and used it to show a diff). When it came time to actually
    make the changes, we would simply move the .augnew file over the file
    being managed. Unfortunately, if the file being managed were a symlink,
    this would clobber it.
    
    There was a fallback path in the case of force (or older versions of
    augeas not supporting SAVE_NEWFILE) in which we would make the
    changes in SAVE_OVERWRITE mode as normal. Now, the behavior is a
    combination of the two; we still use SAVE_NEWFILE to determine whether
    changes need to be made and to show a diff, but then remove the .augnew
    file and always run again in SAVE_OVERWRITE mode to save the changes.
    This effectively delegates the behavior of preserving the file, etc.
    to augeas, so we don't duplicate effort or bugs.
    nicklewis committed Feb 9, 2012
Something went wrong with that request. Please try again.