summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| | | | | | |/ /
| | | | | | * | Merge branch 'ticket/2.6.next/5799' into 2.6.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 2.6.nextMatt Robinson2011-01-062-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 '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 'maint/2.6.next/5771-spec-fixes' into 2.6.nextNick Lewis2011-01-054-96/+6
| | | |\ \
| | | | * | (#5771): Fix spec failures associated with rspec upgradeNick Lewis2011-01-054-96/+6
| | | |/ /
| | | * | Merge branch 'ticket/2.6.next/upgrade_rspec' into 2.6.nextNick Lewis2011-01-0450-228/+83
| | | |\ \
| | | | * | (#5771) Upgrade rspec to version 2Matt Robinson2011-01-0450-228/+83
| | | |/ /
| | | * | Merge branch 'maint/2.6.next/remove_stray_p' into 2.6.nextJesse Wolfe2011-01-031-1/+1
| | | |\ \
| | | | * | maint: remove stray debug statement.Jesse Wolfe2011-01-031-1/+1
| | | |/ /
| | | * | Merge branch 'maint/2.6.next/speed_up_slow_inspects' into 2.6.nextJesse Wolfe2011-01-035-0/+20
| | | |\ \
| | | | * | maint: Prune #inspect methods on various objectsJesse Wolfe2011-01-035-0/+20
| | | * | | Merge branch 'ticket/2.6.next/5758' into 2.6.nextPaul Berry2011-01-033-13/+64
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | (#5758) Verify that report events are correctly createdPaul Berry2011-01-031-6/+56
| | | | * | Prep work for #5758: set audited=true on all audit eventsPaul Berry2011-01-031-4/+6
| | | | * | Prep work for #5758: clean up initializer for Puppet::Transaction::EventPaul Berry2011-01-031-3/+2
| | | * | | Merge branch 'ticket/2.6.next/5698' into 2.6.nextJesse Wolfe2011-01-033-4/+31
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix #5698 puppet inspect shouldn't report of attributes of deleted filesJesse Wolfe2011-01-033-4/+31