summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'ticket/2.6.next/5935' into 2.6.nextNick Lewis2011-02-173-962/+993
|\ \ \ \ \
| * | | | | (#5935) Allow functions to accept negated valuesNick Lewis2011-02-173-962/+993
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function(-1) was failing because the grammar wasn't allowing negated values in function calls. This fix makes the negation of any value which was previously legal as a function argument also now legal as a function argument. Paired-With: Max Martin Paired-With: Markus Roberts
* | | | | Merge branch 'ticket/2.6.next/6346-signal_int_trap' into 2.6.nextMatt Robinson2011-02-1614-28/+16
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * ticket/2.6.next/6346-signal_int_trap: (#6346) Move the trap calls onto Signal so they're easier to stub
| * | | | (#6346) Move the trap calls onto Signal so they're easier to stubMatt Robinson2011-02-1614-28/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once you stub signal traps in tests, you can hit ctrl+c in the middle of a spec run and it will stop the run instead of puppet catching the SIGINT. I had trouble easily tracking down all the places to stub traps when the trap was being called as a private method on applications and daemons, but calling trap on Signal is equivalent since Kernel calls Signal.trap and Object mixes in Kernel to provide trap as a private method on all objects. A bigger solution would be to refactor everywhere we call trap into a method that's called consistently since right now we sprinkle SIGINT and SIGTERM trap handling over applications and daemons in inconsistent ways, returning different error codes and using different messages. I've captured this info in ticket #6345. Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
* | | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-143-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: Updated CHANGELOG for 2.6.5rc4 (#3646) Fix the documentation fix for `puppet apply --apply`
| * | | Updated CHANGELOG for 2.6.5rc4Jacob Helwig2011-02-141-0/+4
| | | |
| * | | Merge branch 'tickets/2.6.x/3646-fix-documentation-fix-fix' into 2.6.xJacob Helwig2011-02-142-6/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/3646-fix-documentation-fix-fix: (#3646) Fix the documentation fix for `puppet apply --apply`
| | * | | (#3646) Fix the documentation fix for `puppet apply --apply`Jacob Helwig2011-02-142-6/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | --apply is actually off of `puppet apply`, not off of `puppet agent` (nor `puppet master`), so move the documentation accordingly. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
* | | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-143-8/+14
|\| | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: Updated CHANGELOG for 2.6.5rc3 Updated fix for #3646 - apply / compile documentation
| * | | Updated CHANGELOG for 2.6.5rc3Jacob Helwig2011-02-141-0/+5
| | | |
| * | | Updated fix for #3646 - apply / compile documentationJames Turnbull2011-02-142-8/+9
| | | |
* | | | Merge branch 'ticket/2.6.next/rspec_returns_1_when_failures' into 2.6.nextMatt Robinson2011-02-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/rspec_returns_1_when_failures: maint: make rspec exit with status 1 when there are failures
| * | | | maint: make rspec exit with status 1 when there are failuresMatt Robinson2011-02-141-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hudson wasn't notifying us when there was a test failure because fail_on_error was set to false. This appears to be because of a misconception that setting this to true caused the specs to run slower. That is not the case. Paired-with: Nick Lewis
* | | | Merge branch '2.6.x' into 2.6.nextMatt Robinson2011-02-140-0/+0
|\| | | | | | | | | | | | | | | | | | | * 2.6.x: (#5977) fix spec test failure when new applications are introduced.
| * | | (#5977) fix spec test failure when new applications are introduced.Daniel Pittman2011-02-141-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test here was previously fragile, in that it would break when new applications were introduced, and in that it depended on the order of items returned from reading the directories on disk. It is now insensitive to those changes, and still verifies that the results we require occur, reducing long term maintenance cost. Reviewed-by: James Turnbull <james@puppetlabs.com>
* | | | Merge branch 'bug/2.6.next/6269-hashes-only-work-with-two-levels' into 2.6.nextDaniel Pittman2011-02-123-393/+408
|\ \ \ \
| * | | | (Fixes #6269) merge changes from masterzen that resolve the issue.Daniel Pittman2011-02-123-393/+408
|/| | | | | | | | | | | | | | | | | | | parser.rb manually rebuilt to resolve global grammer chances.
| * | | | Fix #6269 - Hashes only work with two levels of accessBrice Figureau2011-02-123-800/+800
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following manifest was failing: $hash = { 'a' => { 'b' => { 'c' => 'it works' } } } $out = $hash['a']['b']['c'] because of a typo in the grammar. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* | | | Merge branch 'bug/2.6.next/5516-hashes-can't-be-used-in-selectors' into 2.6.nextDaniel Pittman2011-02-123-1786/+1871
|\ \ \ \
| * | | | (#5516) Rebuild parser.rb after merge.Daniel Pittman2011-02-121-1541/+1630
| | | | | | | | | | | | | | | | | | | | | | | | | The automatically generated parser.rb needed to be rebuilt to make the syntax changes functional; this commits only that rebuild.
| * | | | Merge branch 'masterzen/tickets/2.6.x/5516' into ↵Daniel Pittman2011-02-123-426/+422
|/| | | | | | | | | | | | | | | | | | | bug/2.6.next/5516-hashes-can't-be-used-in-selectors
| * | | | Fix #5516 - Hashes can't be used in selectorsBrice Figureau2011-02-123-426/+422
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following manifest was producing a parse error: $int = { 'eth0' => 'bla' } $foo = $int['eth0'] ? { 'bla' => 'foo', default => 'bleh' } because selectors didn't support hash access. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* | | | (#5977) fix spec test failure when new applications are introduced.Daniel Pittman2011-02-121-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test here was previously fragile, in that it would break when new applications were introduced, and in that it depended on the order of items returned from reading the directories on disk. It is now insensitive to those changes, and still verifies that the results we require occur, reducing long term maintenance cost. Reviewed-by: James Turnbull <james@puppetlabs.com>
* | | | Merge branch 'bug/2.6.next/5720-puppetdoc-fails-on-parameterized-class' into ↵Daniel Pittman2011-02-127-12/+72
|\ \ \ \ | | | | | | | | | | | | | | | 2.6.next
| * | | | misc: ast_context has two arguments, not one.Daniel Pittman2011-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This updates the spec expectation to reflect that, eliminating a warning during the spec run.
| * | | | Merge branch 'masterzen/tickets/2.6/5720' into ↵Daniel Pittman2011-02-127-11/+71
|/| | | | | | | | | | | | | | | | | | | bug/2.6.next/5720-puppetdoc-fails-on-parameterized-class
| * | | | Fix #5720 - puppetdoc misses some class commentsBrice Figureau2011-02-114-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that the fix for #5252 wasn't complete, and class, nodes and definition were still using the current lexer line number instead of the line number of the class/define/node token. This combined with some missing comments stack pushing/pop on parenthesis prevented puppetdoc to correctly get the documentation of some class (including parametrized ones). Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | Fix #6281 - Make sure puppetdoc analyzes all filesBrice Figureau2011-02-112-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can happen that when parsing a file puppet parses other manifests if they get imported (this is at least true for site.pp, even in ignoreimport=true). Thus those files are now "watched". But puppetdoc needs to analyze all files, and since 99c101 we are now checking if the file was already parsed to not reparse it again. If that was the case, though, we weren't analyzing the produced code. Thus it was possible to not produce documentation for the site.pp content. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | Fix #6280 - puppetdoc crashing on string interpolationBrice Figureau2011-02-113-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following manifest was crashing puppetdoc: class test { include "test::$operatingsystem" } Because the quoted string is "rendered" as a concat AST, which in turn ended being an array when entering RDoc. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* | | | Merge branch 'ticket/2.6.next/6270' into 2.6.nextnfagerlund2011-02-092-21/+14
|\ \ \ \
| * | | | (#6270) Fix formatting in split function's doc stringnfagerlund2011-02-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Repaired a 2-indent/4-indent issue that kept a code block from being recognized * Wrapped literal strings in backticks to format as code and protect from Markdown * Added note about backslashes for escaping metacharacters.
| * | | | (#6270) Fix formatting in regsubst function's doc stringnfagerlund2011-02-091-14/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | * Fixed ULs being interpreted as code blocks * Changed an example for variety. * Turned set of paragraphs inside a LI into a nested list.
* | / / (6130) Change header level on metaparameter referencenfagerlund2011-02-081-1/+1
| |/ / |/| | | | | | | | Individual metaparameters under the main H2 on the page should be H3s, not H4s.
* | | Updated CHANGELOG for 2.6.5rc2Jacob Helwig2011-02-081-0/+5
| | |
* | | Merge remote branch 'dan/ticket/2.6.4/5977' into 2.6.nextJesse Wolfe2011-02-082-2/+30
|\ \ \
| * | | (5977) Puppet::Applications can be loaded from multiple paths.Dan Bode2011-01-142-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - previously, Puppet would search $LOAD_PATH and just load applications in the first $LOAD_PATH to have the directory puppet/application. Now multiple paths can contain applications.
* | | | Merge branch 'ticket/2.6.next/6257' into 2.6.nextJesse Wolfe2011-02-081-3/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | (#6257) Speed up PUT and POST requests under rackJesse Wolfe2011-02-081-3/+1
|/ / / | | | | | | | | | | | | | | | | | | This patch significantly speeds up reading the body of HTTP requests from Rack. Reviewed-by: Markus Roberts <markus@puppetlabs.com>
* | | Updated CHANGELOG and version for 2.6.5rc1Nick Lewis2011-02-032-1/+128
| | |
* | | Merge branch '2.6.next' into 2.6.xJacob Helwig2011-02-0310-10/+160
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.next: (#6018) Nick F's --help text for puppet inspect. (#5823) document the not-an-API status of set_run_mode (#5823) run mode can now be set dynamically... (6114) Update the audit metaparameter for 2.6.5. Fix for #5755 -- making zaml serialization robust over projected objects (#4139) hook log autoflush into global defaults
| * \ \ Merge branch 'bug/2.6.next/5755-gc-issue' into 2.6.nextPaul Berry2011-02-031-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * bug/2.6.next/5755-gc-issue: Fix for #5755 -- making zaml serialization robust over projected objects
| | * | | Fix for #5755 -- making zaml serialization robust over projected objectsMarkus Roberts2011-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core problem arose when the fix for #5048 in 31118fe85aca4 introduced a hook to replace objects dynamically durring serialization so that they could be projected / rewritten to a different form for backward compatability. The serialization code assumed that all objects being serialized would remain valid until the serialization was complete, but nothing retained a copy of the temporary objects created in the hook. To resolve this, the serialization layer now maintains a ref to each such object and clears them (to allow GC) after serialization is complete. Paired-with: Jesse Wolfe <jesse@puppetlabs.com> Paired-with: Paul Berry <paul@puppetlabs.com>
| * | | | Merge branch 'docs/2.6.next/inspect-help' into 2.6.nextJesse Wolfe2011-02-031-0/+53
| |\ \ \ \
| | * | | | (#6018) Nick F's --help text for puppet inspect.Jesse Wolfe2011-02-031-0/+53
| | | | | |
| * | | | | Merge branch 'bug/2.6.next/5823-allow-run-mode-to-cut-your-hand-off' into ↵Daniel Pittman2011-02-031-0/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 2.6.next
| | * | | | | (#5823) document the not-an-API status of set_run_modeDaniel Pittman2011-02-031-0/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is totally not API, document that in big, threatening letters so that folks actually know what is going on. Include promises so they don't feel too unhappy with us. Paired-with: matt@puppetlabs.com
| * | | | | Merge branch 'bug/2.6.next/5823-allow-run-mode-to-cut-your-hand-off' into ↵Daniel Pittman2011-02-032-3/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 2.6.next
| | * | | | | (#5823) run mode can now be set dynamically...Daniel Pittman2011-02-032-3/+48
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Third party scripts, and complex command line tools, depend on being able to configure the run_mode value at runtime, not just when they fire up. For better or worse we used to allow this sort of thing to work, but stopped, and we have no sane, safe and consensual alternative, so we broke a bunch of client code. This enables the feature again, but does not add any safety catch; you can now happily slice off your own feet with this, if you really want to.
| * | | | | Merge branch 'ticket/2.6.next/6114' into 2.6.nextnfagerlund2011-02-031-6/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | (6114) Update the audit metaparameter for 2.6.5.nfagerlund2011-02-031-6/+19
| |/ / / / | | | | | | | | | | | | | | | The audit metaparameter has some new behavior, its old behavior has changed, and the previous description was incomplete at any rate. This patch replaces its description string.
generated by cgit (git 2.34.1) at 2025-09-26 19:36:07 +0000