Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'next' | Jesse Wolfe | 2010-11-03 | 26 | -1113/+495 |
|\ | |||||
| * | Merge branch 'maint/next/remove-request-object-from-rest-api' into next | Jesse Wolfe | 2010-11-02 | 14 | -1108/+95 |
| |\ | |||||
| | * | Maint: Remove Indirector::Request objects from HTTP Handler and API V1 | Jesse Wolfe | 2010-11-02 | 14 | -1108/+95 |
| |/ | |||||
| * | Merge branch 'ticket/next/5166' into next | Paul Berry | 2010-11-01 | 2 | -37/+162 |
| |\ | |||||
| | * | (#5166) Inventory service is now searchable by timestamp. | Paul Berry | 2010-11-01 | 2 | -0/+125 |
| | * | Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding fres... | Paul Berry | 2010-11-01 | 1 | -21/+9 |
| | * | Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshness | Paul Berry | 2010-11-01 | 1 | -17/+29 |
| |/ | |||||
| * | Merge branch 'ticket/next/5164' into next | Jesse Wolfe | 2010-11-01 | 3 | -7/+23 |
| |\ | |||||
| | * | Fix #5164 Change Facts timestamp when they are received by the master | Jesse Wolfe | 2010-11-01 | 3 | -6/+20 |
| | * | Maint: Don't use a stub for a Facts object in the compiler specs | Jesse Wolfe | 2010-11-01 | 1 | -1/+2 |
| | * | Maint: spec/unit/indirector/catalog/compiler_spec.rb wouldn't run by itself | Jesse Wolfe | 2010-11-01 | 1 | -0/+1 |
| |/ | |||||
| * | Merge branch 'ticket/next/4894' into next | Matt Robinson | 2010-10-28 | 2 | -7/+15 |
| |\ | |||||
| | * | [#4894] Randomize port on webrick tests | Matt Robinson | 2010-10-28 | 2 | -7/+15 |
| |/ | |||||
| * | Merge branch 'ticket/next/5132' into next | Matt Robinson | 2010-10-28 | 12 | -10/+211 |
| |\ | |||||
| | * | (#5132) Provide a query REST interface for inventory | Matt Robinson | 2010-10-28 | 12 | -10/+211 |
| |/ | |||||
| * | Merge branch 'feature/next/5148-fix' into next | Nick Lewis | 2010-10-28 | 1 | -1/+1 |
| |\ | |||||
| | * | (#5148) Fix failing spec due to timezone | Nick Lewis | 2010-10-28 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'feature/next/5148' into next | Nick Lewis | 2010-10-28 | 2 | -0/+45 |
| |\ | |||||
| | * | (#5148) Add support for PSON to facts | Nick Lewis | 2010-10-28 | 2 | -0/+45 |
| |/ | |||||
* | | Merge commit '85543a4' | Jesse Wolfe | 2010-11-03 | 49 | -2290/+2346 |
|\| | |||||
| * | Merge remote branch 'nigel/tickets/2.6.x/4382' into next | Jesse Wolfe | 2010-10-18 | 1 | -1/+33 |
| |\ | |||||
| | * | Make --mkusers work on OS X, we now find unused uid/gids if unspecified | Nigel Kersten | 2010-10-11 | 1 | -1/+33 |
| * | | Merge commit '2.6.3rc1' into next | Jesse Wolfe | 2010-10-18 | 9 | -25/+87 |
| |\ \ | |||||
| * \ \ | Merge commit '2.6.2' into next | Jesse Wolfe | 2010-10-12 | 4 | -4/+11 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'paul/ticket/next/4657' into next | Jesse Wolfe | 2010-10-05 | 6 | -74/+62 |
| |\ \ \ \ | |||||
| | * | | | | [#4657] Customer-supplied .rb files are not compatible with multiple environm... | Paul Berry | 2010-09-02 | 9 | -62/+193 |
| * | | | | | Merge commit '2.6.2rc1' into next | Jesse Wolfe | 2010-10-04 | 31 | -282/+597 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit '574812e' into next | Jesse Wolfe | 2010-10-04 | 3 | -24/+33 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit '021359b' into next | Jesse Wolfe | 2010-10-04 | 1 | -13/+7 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commits 'd057b90' and '6dd1930' into next | Jesse Wolfe | 2010-10-04 | 5 | -21/+51 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix test failures that fixing #4726 exposed. | Jesse Wolfe | 2010-10-04 | 3 | -11/+11 |
| * | | | | | | | | | Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next | Jesse Wolfe | 2010-10-04 | 17 | -156/+202 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit '99c1019' into next | Jesse Wolfe | 2010-10-04 | 3 | -16/+59 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit '8cd1540' into next | Jesse Wolfe | 2010-10-02 | 6 | -9/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit 'f950061' into next | Jesse Wolfe | 2010-10-02 | 6 | -41/+186 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit '8ff4b9a' into next | Jesse Wolfe | 2010-10-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit '2b50f30' into next | Jesse Wolfe | 2010-10-02 | 4 | -74/+63 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Partial merge to 2.6.2rc1 : Merge commit '7b8cb74' into next | Jesse Wolfe | 2010-10-02 | 11 | -40/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '2.6.1' into next | Jesse Wolfe | 2010-09-13 | 7 | -11/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '2.6.1rc4' into next | Jesse Wolfe | 2010-09-13 | 47 | -2795/+3353 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'paul/ticket/next/4685' into next | Jesse Wolfe | 2010-09-09 | 9 | -1914/+1799 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | Modified the error message that is generated when a class, definition, | Paul Berry | 2010-09-07 | 8 | -150/+168 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | [#4685] Classes, defines, and nodes allowed inside of non-evaluated conditionals | Paul Berry | 2010-09-01 | 4 | -1161/+1130 |
| * | | | | | | | | | | | | | | | | | | Merge remote branch 'paul/ticket/next/4638' into next | Jesse Wolfe | 2010-09-09 | 14 | -515/+359 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | [4638] Cleanup of plurals and inheritance relationships in AST | Paul Berry | 2010-08-27 | 14 | -515/+359 |
| * | | | | | | | | | | | | | | | | | | | Merge remote branch 'paul/ticket/next/3782' into next | Jesse Wolfe | 2010-09-08 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | [3782] Test isolation problem in test/ral/providers/cron/crontab.rb | Paul Berry | 2010-08-31 | 1 | -1/+4 |
| | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge remote branch 'paul/ticket/next/4570' into next | Jesse Wolfe | 2010-09-08 | 2 | -12/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fixed issue #4570 (Race conditions when serializing objects to YAML). | Paul Berry | 2010-08-23 | 2 | -12/+36 |
| * | | | | | | | | | | | | | | | | | | | Merge commit '2.6.1rc3' into next | Jesse Wolfe | 2010-08-27 | 19 | -84/+141 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |