summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | (#5548) Specify return values of manual status commands in service type descr...nfagerlund2011-01-251-4/+10
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'next'Matt Robinson2011-01-1927-741/+866
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '2.6.x' into nextMatt Robinson2011-01-1927-741/+866
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch '2.6.next' into 2.6.xMatt Robinson2011-01-1929-744/+879
| | |\| | | | | | | | | | | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | 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 '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
| | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | Merge branch 'ticket/2.6.next/5799' into 2.6.nextNick Lewis2011-01-072-19/+32
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into 2.6.nextMatt Robinson2011-01-062-1/+3
| | | | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | Merge branch 'maint/2.6.next/inspect_audited_should_be_true' into 2.6.nextMatt Robinson2011-01-062-1/+27
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | maint: Inspect reports should have audited = true on eventsMatt Robinson2011-01-062-1/+27
| | | | | * | | | | | | | | | Merge branch 'maint/2.6.next/add_skipped_to_resource_status' into 2.6.nextPaul Berry2011-01-061-1/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | Maint: Added "skipped" to the YAML output for Puppet::Resource::StatusPaul Berry2011-01-061-1/+2
| | | | | |/ / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'next'Nick Lewis2011-01-076-53/+42
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | maint: Stop stubbing 'use' on any_instance of Puppet::Util::SettingsNick Lewis2011-01-074-34/+10
| * | | | | | | | | | | | | Merge branch 'ticket/2.6.next/5799' into nextNick Lewis2011-01-072-19/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | (#5799) Simplify report dir creationNick Lewis2011-01-062-19/+32
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into nextMatt Robinson2011-01-072-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile'Matt Robinson2011-01-072-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | maint: Add vim swap files to .gitignoreMatt Robinson2011-01-061-0/+1
| * | | | | | | | | | | | maint: Remove rspec options from the RakefileMatt Robinson2011-01-062-1/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'next'Nick Lewis2011-01-06101-1224/+965
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'intermediate_merge_branch' into nextNick Lewis2011-01-06100-1222/+938
| |\ \ \ \ \ \ \ \ \ \