summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bug/2.6.next/5552-running-puppet-cert-without-options-results-i...Daniel Pittman2011-02-222-25/+81
|\
| * (#5552) Display help when no subcommand is given.Daniel Pittman2011-02-222-1/+17
| * (#5552) Clean up subcommand handling inside puppet cert.Daniel Pittman2011-02-222-25/+65
|/
* Merge branch 'ticket/2.6.next/6376-_search-support' into 2.6.nextMax Martin2011-02-211-1/+5
|\
| * (#6376) Add test case for facts find requestMax Martin2011-02-211-1/+5
* | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-218-119/+212
|\ \
| * | Updated CHANGELOG for 2.6.5rc5Jacob Helwig2011-02-211-0/+7
| * | Merge branch 'ticket/2.6.x/6337' into 2.6.xPaul Berry2011-02-211-1/+1
| |\ \
| | * | (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"Daniel Pittman2011-02-211-1/+1
| |/ /
| * | Merge branch 'ticket/2.6.x/6353' into 2.6.xPaul Berry2011-02-215-61/+145
| |\ \
| | * | (#6353) Restore the ability to store paths in the filebucketPaul Berry2011-02-215-61/+145
| |/ /
| * | Merge branch 'bug/2.6.x/6126-puppet-inspect-has-no-status-messages' into 2.6.xDaniel Pittman2011-02-182-58/+60
| |\ \
| | * | (#6126) Puppet inspect now reports status after run completes.Daniel Pittman2011-02-182-58/+60
| |/ /
| * | Merge branch 'tickets/2.6.x/6364-fix-mount-provider-on-aix' into 2.6.xJacob Helwig2011-02-182-8/+8
| |\ \
* | \ \ Merge branch 'tickets/2.6.x/6309-check-what-is-mounted' into 2.6.nextJacob Helwig2011-02-1810-135/+243
|\ \ \ \
| * | | | Remove pending tests from parsed mount providerJacob Helwig2011-02-181-10/+0
| * | | | (#6309) Ensure the correct device is mounted when managing mountsJacob Helwig2011-02-189-118/+241
| * | | | Clean up whitespace, and commented out code in parsed mount providerJacob Helwig2011-02-181-7/+2
| | |/ / | |/| |
* | | | Merge branch 'tickets/2.6.x/6364-fix-mount-provider-on-aix' into 2.6.nextJacob Helwig2011-02-182-8/+8
|\| | |
| * | | (#6364) Adjust mis-translated regex in mount provider for AIXJacob Helwig2011-02-182-8/+8
| |/ /
* | | Merge branch 'ticket/2.6.next/6376-_search-support' into 2.6.nextMax Martin2011-02-182-2/+14
|\ \ \ | | |/ | |/|
| * | (#6376) Add support and testing for _search GET requestsMax Martin2011-02-182-2/+14
|/ /
* | Merge branch 'bug/2.6.next/6337-parenthesize-arguments-for-future-versions' i...Daniel Pittman2011-02-171-1/+1
|\ \
| * | (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"Daniel Pittman2011-02-171-1/+1
|/ /
* | Merge branch 'ticket/2.6.next/6338' into 2.6.nextPaul Berry2011-02-1713-11/+362
|\ \
| * | (#5150) Make fact REST terminus configurable to connect to inventory serviceMatt Robinson2011-02-172-2/+19
| * | (#5166) Inventory service is now searchable by timestamp.Paul Berry2011-02-172-0/+125
| * | Maint: backport timestamp accessor for facts from 2.7 branchPaul Berry2011-02-171-0/+8
| * | Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding fres...Paul Berry2011-02-171-21/+9
| * | Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshnessPaul Berry2011-02-171-17/+29
| * | (#5132) Provide a query REST interface for inventoryPaul Berry2011-02-1711-9/+210
|/ /
* | 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
|/ /
* | Merge branch 'ticket/2.6.next/6346-signal_int_trap' into 2.6.nextMatt Robinson2011-02-1614-28/+16
|\ \
| * | (#6346) Move the trap calls onto Signal so they're easier to stubMatt Robinson2011-02-1614-28/+16
|/ /
* | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-143-6/+9
|\|
| * 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
| |\
| | * (#3646) Fix the documentation fix for `puppet apply --apply`Jacob Helwig2011-02-142-6/+5
| |/
* | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-143-8/+14
|\|
| * 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
|\ \
| * | maint: make rspec exit with status 1 when there are failuresMatt Robinson2011-02-141-1/+1
|/ /
* | Merge branch '2.6.x' into 2.6.nextMatt Robinson2011-02-140-0/+0
|\|
| * (#5977) fix spec test failure when new applications are introduced.Daniel Pittman2011-02-141-4/+9
* | 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
|/| |
| * | Fix #6269 - Hashes only work with two levels of accessBrice Figureau2011-02-123-800/+800
* | | Merge branch 'bug/2.6.next/5516-hashes-can't-be-used-in-selectors' into 2.6.nextDaniel Pittman2011-02-123-1786/+1871
|\ \ \