summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet into ↵Jacob Helwig2011-04-041-2/+6
|\ | | | | | | | | | | | | 2.6.next * 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet: Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking Ruby 1.9
| * Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking ↵James Turnbull2011-03-021-2/+6
| | | | | | | | Ruby 1.9
* | Merge branch 'tickets/2.6.x/3127' into 2.6.nextJames Turnbull2011-04-051-1/+0
|\ \ | | | | | | | | | | | | * tickets/2.6.x/3127: Fixed #3127 - removed legacy debug code
| * | Fixed #3127 - removed legacy debug codeJames Turnbull2011-04-051-1/+0
| | |
* | | Merge branch 'tickets/2.6.x/3127' into 2.6.nextJames Turnbull2011-04-042-3/+14
|\| | | | | | | | | | | | | | * tickets/2.6.x/3127: Fixed #3127 - Fixed gem selection regex
| * | Fixed #3127 - Fixed gem selection regexJames Turnbull2011-04-042-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | Previously if the gem json_pure was installed and you requested the gem json then the regex matched too soon and falshly indicated that the json gem was already installed. Also updated to add the --no-ri and no-rdoc options and fix tests.
* | | Merge branch 'ticket/2.6.x/5437-report-manifest-errors-on-agent' into 2.6.nextJacob Helwig2011-04-014-16/+30
|\ \ \ | | | | | | | | | | | | | | | | * ticket/2.6.x/5437-report-manifest-errors-on-agent: (#5437) Invalidate cached TypeCollection when there was an error parsing
| * | | (#5437) Invalidate cached TypeCollection when there was an error parsingJacob Helwig2011-04-014-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The caching of the TypeCollection in Puppet::Node::Environment would cause parse errors to occur (and be reported) only once and never again, until the file had changed on disk. This would also cause empty catalogs to be sent down to the agents further hiding the problem. Now, when a file fails to parse, it will be re-parsed every time on every following compilation, causing the parse error to be reported every time, and preventing sending down empty catalogs to agents. Paired-with: Nick Lewis <nick@puppetlabs.com>
* | | | (#6937) Adjust formatting of recurse's descnfagerlund2011-04-011-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Prevous formatting would result in broken Markdown after the docs were generated, as Markdown does not recognize a two-space tab as a syntactical element. This patch also changes the list of values to a bulleted list instead of a code block.
* | | | (#6937) Document the recurse parameter of File type.Ben Hughes2011-04-011-1/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | Update the desc block with information gleaned from #1469 and the code about recurse => remote and other types of recursion. The auto generated documentation was sparse and this is an area that often comes up on the mailing list/IRC.
* | | Merge branch 'ticket/2.6.next/5670' into 2.6.nextNick Lewis2011-03-302-28/+35
|\ \ \ | |/ / |/| |
| * | (#5670) Don't trigger refresh from a failed resourceNick Lewis2011-03-302-28/+35
|/ / | | | | | | | | | | | | | | Resources were triggering their subscribing/notified resources when they failed, which is incorrect. Now, events are only queued if the resource was successful. Paired-With: Max Martin
* | Merge branch '2.6.next' into 2.6.xMax Martin2011-03-3038-528/+1874
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (23 commits) (#5908) Add support for new update-rc.d disable API (#6862) Add a default subject for the mail_patches rake task Fixed #6256 - Creation of rrd directory. (#5477) Allow watch_file to watch non-existent files, especially site.pp (#5221) Add test for fix to fileset with trailing separator (#5221) Fix fileset path absoluteness checking with trailing slash (#4769) Fix negative timeout support for newer rubies Fixed #6562 - Minor kick documentation fix (#6658) Propagate ENC connection errors to the agent (#4884) Remove typo from spec test (#4884) Modify tests to pass on non-OS X systems (#4884) Revise new exec tests, add a few more (4576) - if ENC declares invalid class, it is logged at warning. (#4884) Add an shell provider for execs (#4884) Fix Test::Unit exec tests (#4884) Break the exec type out to have a posix provider (#4884) Add consistent path validation and behavior (#4884) Add expand_path to requiring the spec_helper (#4884) Autorequire shared behaviors and method to silence warnings (#4884) Fix whitespace ...
| * \ Merge branch 'ticket/2.6.next/5908-update-rc' into 2.6.nextMax Martin2011-03-302-4/+20
| |\ \ | | | | | | | | | | | | | | | | * ticket/2.6.next/5908-update-rc: (#5908) Add support for new update-rc.d disable API
| | * | (#5908) Add support for new update-rc.d disable APIMax Martin2011-03-302-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the new disable API to update-rc.d and added spec tests to check this functionality. This change was made because in versions of sysv-rc >= 2.88, 'update-rc.d stop' is broken and actually enables the service. We only changed the disable case as the enable case still works on systems which use sysv-rc 2.88 or greater (atm, only Debian Lenny). We wanted to change as little as possible because update-rc.d prints a message stating that the new enable/disable API is unstable and may change in the future. Paired-with:Matt Robinson, Jacob Helwig
| * | | Merge branch 'tickets/2.6.x/6862' into 2.6.nextJacob Helwig2011-03-281-1/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | * tickets/2.6.x/6862: (#6862) Add a default subject for the mail_patches rake task
| | * | (#6862) Add a default subject for the mail_patches rake taskBrice Figureau2011-03-261-1/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | This will prevent committers to forget to write cover letter subject when rake mail_patches needs to send multiple e-mails. It defaults to the "type" and "branch name" of the patch-set. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | Merge branch 'tickets/2.6.x/6256' into 2.6.nextJames Turnbull2011-03-263-3/+4
| |\ \ | | | | | | | | | | | | | | | | * tickets/2.6.x/6256: Fixed #6256 - Creation of rrd directory.
| | * | Fixed #6256 - Creation of rrd directory.James Turnbull2011-03-263-3/+4
| | | | | | | | | | | | | | | | Added :metrics to the settings used by the master
| * | | Merge branch 'ticket/2.6.next/5477' into 2.6.nextJesse Wolfe2011-03-259-28/+40
| |\ \ \
| | * | | (#5477) Allow watch_file to watch non-existent files, especially site.ppJesse Wolfe2011-03-259-28/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The watch_file mechanism would refuse to monitor paths to files that didn't exist. This patch makes it possible to watch a file that hasn't been created yet, so when it is created, you manifests will get reparsed. Backported this change to 2.6.x Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| * | | | Merge branch 'ticket/2.6.next/5221' into 2.6.nextNick Lewis2011-03-242-0/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | (#5221) Add test for fix to fileset with trailing separatorNick Lewis2011-03-241-0/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Pieter van de Bruggen
| | * | | (#5221) Fix fileset path absoluteness checking with trailing slashJames Turnbull2011-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Nick Lewis Reviewed-By: Pieter van de Bruggen
| * | | | Merge branch 'feature/2.6.next/4576' of https://github.com/bodepd/puppet ↵Jesse Wolfe2011-03-242-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into 2.6.next
| | * | | | (4576) - if ENC declares invalid class, it is logged at warning.Dan Bode2011-03-162-3/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | used to be at info, so you had to run the master on verbose to see it an ENC was trying to declare a class that could not be loaded.
| * | | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-03-241-2/+3
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * 2.6.x: Update CHANGELOG for 2.6.7
* | | | | Update CHANGELOG for 2.6.7Jacob Helwig2011-03-241-2/+3
| |/ / / |/| | |
| * | | Merge branch 'ticket/2.6.next/4769' into 2.6.nextNick Lewis2011-03-242-10/+20
| |\ \ \
| | * | | (#4769) Fix negative timeout support for newer rubiesNick Lewis2011-03-242-10/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | In new versions of Ruby, negative timeouts are unsupported. So munge negatives to zero in the parameter. Reviewed-By: Jacob Helwig
| * | | Merge branch 'tickets/2.6.x/6562' into 2.6.nextJames Turnbull2011-03-221-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/6562: Fixed #6562 - Minor kick documentation fix
| | * | | Fixed #6562 - Minor kick documentation fixJames Turnbull2011-03-221-1/+0
| | | | |
| * | | | Merge branch 'ticket/2.6.next/6658' into 2.6.nextMatt Robinson2011-03-182-5/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6658: (#6658) Propagate ENC connection errors to the agent
| | * | | | (#6658) Propagate ENC connection errors to the agentMatt Robinson2011-03-182-5/+3
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the master failed to run the External Node Classifier script it would log an error on the master, but the agent didn't get back the full error or the stack trace for it's logs. By raising when there's an ENC script problem on the master, this causes the error messages to propagate to the agent. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
| * | | | Merge branch 'ticket/2.6.x/5814' into 2.6.nextMax Martin2011-03-181-18/+466
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.x/5814: (#5814) Improved cron type specs (#5814) cron_spec shouldn't depend on cron provider
| | * | | | (#5814) Improved cron type specsStefan Schulte2011-01-091-17/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs to test value validation for minute, hour, weekday, month and monthday
| | * | | | (#5814) cron_spec shouldn't depend on cron providerStefan Schulte2011-01-091-1/+12
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if cron is not installed the specs will throw errors abould not finding a default provider. Because the spec doesn't test provider features it shouldn't depend on any providers. Add stubs to let cron_spec work with no suitable provider
| * | | | Merge branch 'ticket/2.6.next/maint-more-exec-testing' into 2.6.nextMax Martin2011-03-181-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/maint-more-exec-testing: (#4884) Remove typo from spec test
| | * | | | (#4884) Remove typo from spec testMax Martin2011-03-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the stubs was accidentally stubbing for /bin/foo instead of /bin/true. Reviewed-by:Nick Lewis
| * | | | Merge branch 'ticket/2.6.next/maint-fix-exec-tests' into 2.6.nextMax Martin2011-03-182-75/+82
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/maint-fix-exec-tests: (#4884) Modify tests to pass on non-OS X systems
| | * | | | (#4884) Modify tests to pass on non-OS X systemsMax Martin2011-03-182-75/+82
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed problems with the spec tests for the new exec type and providers that were causing failures on non-OS X systems. This involved rearranging some of the tests and their describe blocks, which makes the diff look more dramatic than it really is. Paired-with:Matt Robinson, Jacob Helwig
| * | | | Merge branch ↵Max Martin2011-03-1715-434/+1279
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/2.6.next/4884-an-exec-provider-that-executes-unfiltered-bash-code' into 2.6.next * feature/2.6.next/4884-an-exec-provider-that-executes-unfiltered-bash-code: (#4884) Revise new exec tests, add a few more (#4884) Add an shell provider for execs (#4884) Fix Test::Unit exec tests (#4884) Break the exec type out to have a posix provider (#4884) Add consistent path validation and behavior (#4884) Add expand_path to requiring the spec_helper (#4884) Autorequire shared behaviors and method to silence warnings (#4884) Fix whitespace (#4884) Get rid of open3 require since it wasn't being used
| * | | | (#4884) Revise new exec tests, add a few moreMax Martin2011-03-173-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revised a few of the new tests for the exec type and provider to ensure that they were testing what they meant to, and added in a couple of new tests. Reviewed-by:Daniel Pittman
| * | | | (#4884) Add an shell provider for execsMatt Robinson2011-03-152-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to use shell builtins when the exec is inline bash commands. Paired-with: Max Martin
| * | | | (#4884) Fix Test::Unit exec testsMatt Robinson2011-03-151-176/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly this is whitespace cleanup, but other than that it's changing a couple method names and calling run on the new exec providers instead of the types. We started moving these tests into spec, but they weren't very self contained so were hard to map over cleanly. For now leaving them since they serve as a more integration level set of tests. Paired-with: Max Martin
| * | | | (#4884) Break the exec type out to have a posix providerDaniel Pittman2011-03-154-239/+841
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for allowing other new providers to handle exec commands differently. Reviewed-by: Max Martin and Matt Robinson
| * | | | (#4884) Add consistent path validation and behaviorDaniel Pittman2011-03-154-0/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many path parameters were implementing their own inconsistent validation and behavior. Now those parameters can have a parent class that makes things a lot more consistent. Reviewed-by: Matt Robinson and Max Martin
| * | | | (#4884) Add expand_path to requiring the spec_helperMatt Robinson2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | Paired-with: Max Martin
| * | | | (#4884) Autorequire shared behaviors and method to silence warningsDaniel Pittman2011-03-152-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with_verbose_disabled allows you to run tests that muck with constans without getting spammy warnings. Reviewed-by: Max Martin and Matt Robinson
| * | | | (#4884) Fix whitespaceMatt Robinson2011-03-151-15/+9
| | | | | | | | | | | | | | | | | | | | Paired-with: Max Martin