summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next'Jesse Wolfe2010-11-0326-1113/+495
|\
| * Merge branch 'maint/next/remove-request-object-from-rest-api' into nextJesse Wolfe2010-11-0214-1108/+95
| |\
| | * Maint: Remove Indirector::Request objects from HTTP Handler and API V1Jesse Wolfe2010-11-0214-1108/+95
| |/
| * Merge branch 'ticket/next/5166' into nextPaul Berry2010-11-012-37/+162
| |\
| | * (#5166) Inventory service is now searchable by timestamp.Paul Berry2010-11-012-0/+125
| | * Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding fres...Paul Berry2010-11-011-21/+9
| | * Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshnessPaul Berry2010-11-011-17/+29
| |/
| * Merge branch 'ticket/next/5164' into nextJesse Wolfe2010-11-013-7/+23
| |\
| | * Fix #5164 Change Facts timestamp when they are received by the masterJesse Wolfe2010-11-013-6/+20
| | * Maint: Don't use a stub for a Facts object in the compiler specsJesse Wolfe2010-11-011-1/+2
| | * Maint: spec/unit/indirector/catalog/compiler_spec.rb wouldn't run by itselfJesse Wolfe2010-11-011-0/+1
| |/
| * Merge branch 'ticket/next/4894' into nextMatt Robinson2010-10-282-7/+15
| |\
| | * [#4894] Randomize port on webrick testsMatt Robinson2010-10-282-7/+15
| |/
| * Merge branch 'ticket/next/5132' into nextMatt Robinson2010-10-2812-10/+211
| |\
| | * (#5132) Provide a query REST interface for inventoryMatt Robinson2010-10-2812-10/+211
| |/
| * Merge branch 'feature/next/5148-fix' into nextNick Lewis2010-10-281-1/+1
| |\
| | * (#5148) Fix failing spec due to timezoneNick Lewis2010-10-281-1/+1
| |/
| * Merge branch 'feature/next/5148' into nextNick Lewis2010-10-282-0/+45
| |\
| | * (#5148) Add support for PSON to factsNick Lewis2010-10-282-0/+45
| |/
* | Merge commit '85543a4'Jesse Wolfe2010-11-0349-2290/+2346
|\|
| * Merge remote branch 'nigel/tickets/2.6.x/4382' into nextJesse Wolfe2010-10-181-1/+33
| |\
| | * Make --mkusers work on OS X, we now find unused uid/gids if unspecifiedNigel Kersten2010-10-111-1/+33
| * | Merge commit '2.6.3rc1' into nextJesse Wolfe2010-10-189-25/+87
| |\ \
| * \ \ Merge commit '2.6.2' into nextJesse Wolfe2010-10-124-4/+11
| |\ \ \
| * \ \ \ Merge remote branch 'paul/ticket/next/4657' into nextJesse Wolfe2010-10-056-74/+62
| |\ \ \ \
| | * | | | [#4657] Customer-supplied .rb files are not compatible with multiple environm...Paul Berry2010-09-029-62/+193
| * | | | | Merge commit '2.6.2rc1' into nextJesse Wolfe2010-10-0431-282/+597
| |\ \ \ \ \
| * \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '574812e' into nextJesse Wolfe2010-10-043-24/+33
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '021359b' into nextJesse Wolfe2010-10-041-13/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commits 'd057b90' and '6dd1930' into nextJesse Wolfe2010-10-045-21/+51
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix test failures that fixing #4726 exposed.Jesse Wolfe2010-10-043-11/+11
| * | | | | | | | | Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into nextJesse Wolfe2010-10-0417-156/+202
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '99c1019' into nextJesse Wolfe2010-10-043-16/+59
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '8cd1540' into nextJesse Wolfe2010-10-026-9/+27
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit 'f950061' into nextJesse Wolfe2010-10-026-41/+186
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '8ff4b9a' into nextJesse Wolfe2010-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '2b50f30' into nextJesse Wolfe2010-10-024-74/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Partial merge to 2.6.2rc1 : Merge commit '7b8cb74' into nextJesse Wolfe2010-10-0211-40/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '2.6.1' into nextJesse Wolfe2010-09-137-11/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '2.6.1rc4' into nextJesse Wolfe2010-09-1347-2795/+3353
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'paul/ticket/next/4685' into nextJesse Wolfe2010-09-099-1914/+1799
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Modified the error message that is generated when a class, definition,Paul Berry2010-09-078-150/+168
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | [#4685] Classes, defines, and nodes allowed inside of non-evaluated conditionalsPaul Berry2010-09-014-1161/+1130
| * | | | | | | | | | | | | | | | | | Merge remote branch 'paul/ticket/next/4638' into nextJesse Wolfe2010-09-0914-515/+359
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | [4638] Cleanup of plurals and inheritance relationships in ASTPaul Berry2010-08-2714-515/+359
| * | | | | | | | | | | | | | | | | | | Merge remote branch 'paul/ticket/next/3782' into nextJesse Wolfe2010-09-081-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | [3782] Test isolation problem in test/ral/providers/cron/crontab.rbPaul Berry2010-08-311-1/+4
| | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge remote branch 'paul/ticket/next/4570' into nextJesse Wolfe2010-09-082-12/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fixed issue #4570 (Race conditions when serializing objects to YAML).Paul Berry2010-08-232-12/+36
| * | | | | | | | | | | | | | | | | | | Merge commit '2.6.1rc3' into nextJesse Wolfe2010-08-2719-84/+141
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |