summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactoring duplicate code and logic in prep for DESTDIR deprecation.Elias Lutfallah2011-03-051-25/+19
* Merge branch 'ticket/2.6.next/6606' into 2.6.nextnfagerlund2011-03-0411-11/+41
|\
| * (#6606) Inline docs: Document all autorequire relationshipsnfagerlund2011-03-0411-11/+41
|/
* Merge branch 'ticket/2.6.next/6602' into 2.6.nextNick Lewis2011-03-041-1/+1
|\
| * (#5148) Fix failing spec due to timezoneNick Lewis2011-03-041-1/+1
* | Merge branch 'ticket/2.6.next/6602' into 2.6.nextNick Lewis2011-03-042-0/+45
|\|
| * (#5148) Add support for PSON to factsNick Lewis2011-03-042-0/+45
|/
* Merge branch 'ticket/2.6.next/6581' into 2.6.nextNick Lewis2011-03-036-310/+289
|\
| * (#6338) Remove inventory indirection, and move to facts indirectionNick Lewis2011-03-036-310/+289
* | Merge branch 'ticket/2.6.next/6445' into 2.6.nextnfagerlund2011-03-031-1/+1
|\ \ | |/ |/|
| * (#6445) Fix inline docs: puppet agent does not accept --mkusersBen Hughes2011-03-031-1/+1
|/
* Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-03-022-1/+6
|\
| * Update CHANGELOG and version for 2.6.6rc1Jacob Helwig2011-03-022-1/+6
| * (#6541) Fix content with checksum truncation bugMatt Robinson2011-03-022-4/+31
| * (#6418) Recursive files shouldn't be auditedJesse Wolfe2011-03-021-14/+0
* | Merge branch 'ticket/2.6.next/6541-md5_in_content_truncates' into 2.6.nextMatt Robinson2011-03-023-33/+63
|\ \
| * | (#6541) maint: whitespace cleanup on the file integration specMatt Robinson2011-03-021-29/+32
| * | (#6541) Fix content with checksum truncation bugMatt Robinson2011-03-022-4/+31
|/ /
* | Merge branch '2.6.x' into 2.6.nextNigel Kersten2011-02-281-15/+14
|\|
| * Update CHANGELOG for 2.6.5Nigel Kersten2011-02-281-15/+14
* | Merge branch 'ticket/2.6.next/5466' into 2.6.nextMatt Robinson2011-02-283-22/+40
|\ \
| * | (#5466) Write specs for output of puppet resourceMatt Robinson2011-02-281-13/+17
| * | (#5466) Monkey patch Symbol so that you can sort themMatt Robinson2011-02-281-0/+3
| * | (#5466) Fixed puppet resource bug with trailing ,Nan Liu2011-02-281-9/+20
|/ /
* | Merge branch 'maint/2.6.next/revert-5935' into 2.6.nextNick Lewis2011-02-283-993/+962
|\ \
| * | Revert "(#5935) Allow functions to accept negated values"Nick Lewis2011-02-213-993/+962
* | | Merge branch 'ticket/2.6.next/4922' into 2.6.nextNick Lewis2011-02-282-138/+38
|\ \ \
| * | | (#4922) Don't truncate remotely-sourced files on 404Nick Lewis2011-02-282-138/+38
* | | | Merge branch 'ticket/2.6.next/4914' into 2.6.nextPaul Berry2011-02-2815-447/+603
|\ \ \ \
| * \ \ \ Merge branch 'ticket/2.6.x/4914' into maint/2.6.next/revert-6309Paul Berry2011-02-2813-307/+586
| |\ \ \ \
| | * | | | (#4914) Improved stubbing in mount/parsed_spec tests.Paul Berry2011-02-251-1/+5
| | * | | | (#4914) Improved parsed_spec for mountStefan Schulte2011-02-208-48/+229
| | * | | | (#4914) Remove mount specsStefan Schulte2011-02-201-80/+3
| | * | | | (#4914) Specs for mounted? match new behaviourStefan Schulte2011-01-301-37/+13
| | * | | | (#4914) Add specs for modified mount providerStefan Schulte2011-01-251-13/+46
| | * | | | (#4914) Add specs for modified mount typeStefan Schulte2011-01-251-110/+182
| | * | | | (#4914) Update property blocksStefan Schulte2011-01-251-20/+35
| | * | | | (#4914) Query property_hash for mountstateStefan Schulte2011-01-251-14/+12
| | * | | | (#4914) Prefetch mountstateStefan Schulte2011-01-251-0/+50
| | * | | | (#4914) Join lines for better readabilityStefan Schulte2011-01-251-9/+2
| * | | | | Revert "(#6309) Ensure the correct device is mounted when managing mounts"Paul Berry2011-02-259-241/+118
* | | | | | Merge branch 'ticket/2.6.next/maint-remove_version_control_tags' into 2.6.nextMatt Robinson2011-02-2811-23/+0
|\ \ \ \ \ \
| * | | | | | (#6338) Remove unused version control tagsMatt Robinson2011-02-2811-23/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ticket/2.6.next/6509' into 2.6.nextnfagerlund2011-02-2810-80/+90
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Maint: Align tabs in a code block in the Augeas type.nfagerlund2011-02-281-4/+4
| * | | | | (#6509) Inline docs: Fix erroneous code block in directoryservice provider fo...nfagerlund2011-02-281-3/+1
| * | | | | Maint: Rewrite comments about symlinks to reflect best practice.nfagerlund2011-02-282-18/+25
| * | | | | (#6509) Inline docs: Fix broken lists in Launchd provider.nfagerlund2011-02-281-8/+11
| * | | | | (#6509) Inline docs: Fix broken code blocks in zpool typenfagerlund2011-02-281-5/+7
| * | | | | (#6509) Inline docs: Fix code blocks in service type.nfagerlund2011-02-282-10/+10