summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bug/2.6.next/5855-freebsd-withenv' into 2.6.nextDaniel Pittman2011-01-262-2/+57
|\
| * Feature #5855 -- fix withenv call in freebsd package providerfredrik-eriksson2011-01-261-2/+2
| * Feature #5855 -- undefined method 'withenv' in FreeBSD package provider.Daniel Pittman2011-01-261-0/+55
|/
* Merge branch 'bug/2.6.next/6009' into 2.6.nextDaniel Pittman2011-01-252-2/+40
|\
| * Fixed #6009 - nested member list vs directory service group providerJames Turnbull2011-01-252-2/+40
* | Merge branch 'ticket/2.6.next/5944' into 2.6.nextnfagerlund2011-01-251-6/+28
|\ \
| * | (#5944) Remove documentation of define() when used on nodes, as it is not a s...nfagerlund2011-01-251-21/+3
| * | (#5944) Further edits of inline defined() documentation.nfagerlund2011-01-251-25/+30
| * | (#5944) Improve documentation of defined() functionnfagerlund2011-01-251-6/+41
|/ /
* | Merge branch 'ticket/2.6.next/5594' into 2.6.nextnfagerlund2011-01-251-32/+2
|\ \
| * | (#5594) Update documentation of exec resource type.nfagerlund2011-01-251-32/+2
* | | Merge branch 'ticket/2.6.next/5931' into 2.6.nextPaul Berry2011-01-2531-118/+113
|\ \ \ | |/ / |/| |
| * | (#5931) Prevent errors when calling insync? on audited propertiesPaul Berry2011-01-2530-97/+110
| * | Maint: Removed dead code from resource harness.Paul Berry2011-01-251-18/+0
| * | Maint: Rename misleading insync? method in file providerPaul Berry2011-01-253-3/+3
| |/
* | Merge branch 'ticket/2.6.next/5548' into 2.6.nextnfagerlund2011-01-251-4/+10
|\ \ | |/ |/|
| * (#5548) Specify return values of manual status commands in service type descr...nfagerlund2011-01-251-4/+10
|/
* Merge branch 'ticket/2.6.next/5900' into 2.6.nextNick Lewis2011-01-141-1/+2
|\
| * (#5900) Include ResourceStatus#failed in serialized reportsNick Lewis2011-01-141-1/+2
* | Merge remote branch 'jamtur01/tickets/2.6.x/5875' into 2.6.nextPaul Berry2011-01-141-2/+2
|\ \ | |/ |/|
| * Locked Puppet license to GPLv2James Turnbull2011-01-131-2/+2
| * Merge branch 'ticket/2.6.next/5799' into 2.6.xNick Lewis2011-01-072-19/+32
| |\
| * \ Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into 2.6.xMatt Robinson2011-01-062-1/+3
| |\ \
| * \ \ Merge branch '2.6.next' into 2.6.xNick Lewis2011-01-05103-1261/+958
| |\ \ \
| * \ \ \ Merge branch '2.6.next' into 2.6.xMatt Robinson2010-12-1616-12/+30
| |\ \ \ \
| * \ \ \ \ Merge branch '2.6.next' into 2.6.xNick Lewis2010-12-1633-256/+507
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'ticket/2.6.next/5882' into 2.6.nextNick Lewis2011-01-132-15/+106
|\ \ \ \ \ \ \
| * | | | | | | (#5882) Added error-handling for bucketing files in puppet inspectNick Lewis2011-01-132-3/+21
| * | | | | | | (#5882) Added error-handling to puppet inspect when auditingNick Lewis2011-01-132-13/+86
|/ / / / / / /
* | | | | | | Merge branch 'ticket/2.6.next/5171-upload-files-during-inspect' into 2.6.nextPaul Berry2011-01-133-0/+101
|\ \ \ \ \ \ \
| * | | | | | | (#5171) Made "puppet inspect" upload audited files to a file bucketPaul Berry2011-01-133-0/+100
| * | | | | | | Prep for #5171: Added a missing require to inspect application.Paul Berry2011-01-131-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'ticket/2.6.next/5838' into 2.6.nextPaul Berry2011-01-1221-650/+505
|\ \ \ \ \ \ \
| * | | | | | | (#5838) Support paths as part of file bucket requests.Paul Berry2011-01-122-85/+79
| * | | | | | | (#5838) Improve the quality of file bucket specs.Paul Berry2011-01-122-36/+66
| * | | | | | | (#5838) Make file bucket dipper efficient when saving a file that already existsPaul Berry2011-01-122-1/+29
| * | | | | | | (#5838) Implemented the "head" method for FileBucketFile::File terminus.Paul Berry2011-01-126-445/+81
| * | | | | | | (#5838) Reworked file dipper spec to perform less stubbing.Paul Berry2011-01-121-82/+32
| * | | | | | | (#5838) Added support for HEAD requests to the indirector.Paul Berry2011-01-1215-21/+247
| * | | | | | | (#5838) Refactored error handling logic into find_in_cache.Paul Berry2011-01-121-7/+6
| * | | | | | | (#5838) Refactored Puppet::Network::Rights#fail_on_denyPaul Berry2011-01-124-47/+39
* | | | | | | | Merge branch 'maint/2.6.next/remove_unused_rakefile' into 2.6.nextMatt Robinson2011-01-111-91/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | maint: Remove unused Rakefile in spec directoryMatt Robinson2011-01-111-91/+0
|/ / / / / / /
* | | | | | | Merge branch 'ticket/2.6.next/5171-filebucket-diff' into 2.6.nextPaul Berry2011-01-115-3/+67
|\ \ \ \ \ \ \
| * | | | | | | (#5171) Made filebucket able to perform diffsJesse Wolfe2011-01-115-3/+67
|/ / / / / / /
* | | | | | | Merge branch 'ticket/2.6.next/5710' into 2.6.nextPaul Berry2011-01-072-35/+64
|\ \ \ \ \ \ \
| * | | | | | | (#5710) Removed unnecessary calls to insync?Paul Berry2011-01-072-2/+28
| * | | | | | | Prep for fixing #5710: Refactor stub provider in resource harness specPaul Berry2011-01-071-33/+36
|/ / / / / / /
* | | | | | | Merge branch 'maint/2.6.next/test_partial_resource_failure' into 2.6.nextPaul Berry2011-01-071-0/+58
|\ \ \ \ \ \ \
| * | | | | | | Maint: test partial resource failurePaul Berry2011-01-071-0/+58
|/ / / / / / /