summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint/2.6.next/test_mount' into 2.6.nextMax Martin2011-03-081-35/+64
|\
| * Added integration tests for the mount providerPaul Berry2011-03-081-35/+64
* | Merge branch 'tickets/2.6.next/5794-create-report-parentdir' of git://github....Jacob Helwig2011-03-082-2/+5
|\ \
| * | (#5794) create reports directory when creating host specific directoryValdis Victor Vitayaudom2011-03-052-2/+5
* | | Merge branch 'ticket/2.6.x/6513-propigate-environment-in-settings-values' int...Jacob Helwig2011-03-082-3/+12
|\ \ \
| * | | (#6513) Propagate the environment when doing variable lookup in settingsJacob Helwig2011-03-082-2/+11
| * | | (#6513) Adjust P::U::Settings test name to reflect what it testsJacob Helwig2011-03-081-1/+1
|/ / /
* | | Merge branch 'ticket/2.6.next/5724-deprecate_DESTDIR_for_install.rb' of git:/...Jacob Helwig2011-03-081-25/+20
|\ \ \ | |_|/ |/| |
| * | (5724) Prep for deprecation of DESTDIRElias Lutfallah2011-03-051-0/+1
| * | Refactoring duplicate code and logic in prep for DESTDIR deprecation.Elias Lutfallah2011-03-051-25/+19
| |/
* | Merge branch 'ticket/2.6.next/6632' into 2.6.nextPaul Berry2011-03-084-32/+14
|\ \
| * | (#6632) Adding a new mount no longer causes error with umountPaul Berry2011-03-084-32/+14
|/ /
* | Adjust Darwin mount provider tests to pass on LinuxPaul Berry2011-03-071-2/+2
* | Merge branch 'maint/2.6.next/test_mount' into 2.6.nextPaul Berry2011-03-071-0/+93
|\ \
| * | Maint: Begin adding integration tests for the mount providerPaul Berry2011-03-071-0/+93
|/ /
* | Merge branch 'maint/2.6.next/make_execute_stubbable' into 2.6.nextPaul Berry2011-03-074-0/+67
|\ \ | |/ |/|
| * Maint: Added the ability to replace the behavior ofPaul Berry2011-03-074-0/+67
|/
* 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