summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Maint: Move "Local-branch:" info below "---"Paul Berry2010-11-111-1/+1
| |/ / / /
* | | | | Merge branch 'next'Paul Berry2010-11-1025-193/+568
|\| | | |
| * | | | Merge remote branch 'masterzen/tickets/2.6.x/5023' into nextPaul Berry2010-11-091-26/+62
| |\ \ \ \
| | * | | | Puppet-load: better and safer error reportingBrice Figureau2010-10-171-1/+3
| | * | | | Fix #5023 - puppet-load multiple nodes supportBrice Figureau2010-10-171-25/+59
| * | | | | Merge branch 'feature/master/5198' into nextPaul Berry2010-11-092-5/+8
| |\ \ \ \ \
| | * | | | | (#5198) Added a spec test for new TB unitPaul Berry2010-11-091-1/+2
| | * | | | | (#5198) add terabyte support to tidy type's size parameterGarrett Honeycutt2010-11-031-3/+4
| | * | | | | (#5198) add gigabyte reference to docs for tidy type's size parameterGarrett Honeycutt2010-11-031-3/+4
| * | | | | | Merge remote branch 'jamtur01/tickets/2.6.x/5108' into nextPaul Berry2010-11-092-0/+6
| |\ \ \ \ \ \
| | * | | | | | Fixed to #5108 - Change default of service hasstatus property to trueJames Turnbull2010-10-272-0/+6
| * | | | | | | Merge remote branch 'jeffmccune/ticket/2.6.x/5062' into nextPaul Berry2010-11-091-0/+80
| |\ \ \ \ \ \ \
| | * | | | | | | (#5062) Add envpuppet helper script to ext/Jeff McCune2010-10-251-0/+80
| | |/ / / / / /
| * | | | | | | Merge commit '2.6.3rc2' into nextPaul Berry2010-11-0912-139/+210
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit '2.6.3rc2' into nextPaul Berry2010-11-0912-139/+210
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Updated CHANGELOG for 2.6.3rc2James Turnbull2010-10-291-0/+9
| | | * | | | | | Fixed #5112 - Launchd Service broke in 2.6.2 with OS X 10.4 Clients.donavan2010-10-291-1/+1
| | | * | | | | | Fixed #5137 - Removed no longer required TOC referencesJames Turnbull2010-10-291-2/+0
| | | * | | | | | Kludge for #5048 -- serialization compatibility with 0.25.xMarkus Roberts2010-10-271-0/+10
| | | * | | | | | (#4534/#4778) -- Normalize parameterized classesPaul Berry2010-10-276-127/+178
| | | |/ / / / /
| | | * | / / / Fix for #5022 -- Escaped newlines should be elidedMarkus Roberts2010-10-182-1/+3
| | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'ticket/next/5150' into nextMatt Robinson2010-11-092-2/+19
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | (#5150) Make fact REST terminus configurable to connect to inventory serviceMatt Robinson2010-11-052-2/+19
| * | | | | | Merge branch 'maint/next/add_local_branch_to_mail_patches' into nextPaul Berry2010-11-091-1/+12
| |\ \ \ \ \ \
| | * | | | | | Maint: Add "Local-branch:" info to mails sent by "rake mail_patches"Paul Berry2010-11-091-1/+12
| |/ / / / / /
| * | | | | | Merge branch 'maint/next/clean_up_agent_spec' into nextPaul Berry2010-11-091-20/+21
| |\ \ \ \ \ \
| | * | | | | | Maint: remove unnecessary stubbing from agent_specPaul Berry2010-11-091-20/+21
| * | | | | | | Merge branch 'maint/next/missing_fileserver_requires' into nextPaul Berry2010-11-091-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Maint: Added missing requires to fileserver.rb.Paul Berry2010-11-091-0/+2
| |/ / / / / /
| * | | | | | Merge branch 'maint/next/forkbomb' into nextJesse Wolfe2010-11-091-0/+8
| |\ \ \ \ \ \
| | * | | | | | maint: prevent fork bombs by disabling ActiveSupport's Kernel.daemonizeJesse Wolfe2010-11-091-0/+8
| * | | | | | | Merge branch 'feature/next/cert_inspector' into nextJesse Wolfe2010-11-081-0/+140
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | maint: First draft of cert inspectorPaul Berry2010-11-081-0/+140
| |/ / / / / /
| * | | | | | Bookkeeping: Merge commit '9e2a0e4' into nextJesse Wolfe2010-11-040-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | 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
| |\ \ \ \ \