Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch '2.6.next' into 2.6.x | Nick Lewis | 2011-01-05 | 103 | -1261/+958 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge branch '2.6.next' into 2.6.x | Matt Robinson | 2010-12-16 | 16 | -12/+30 | |
|\ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ | Merge branch '2.6.next' into 2.6.x | Nick Lewis | 2010-12-16 | 33 | -256/+507 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| | | | | | * | | Merge branch 'ticket/2.6.next/5882' into 2.6.next | Nick Lewis | 2011-01-13 | 2 | -15/+106 | |
| | | | | | |\ \ | ||||||
| | | | | | | * | | (#5882) Added error-handling for bucketing files in puppet inspect | Nick Lewis | 2011-01-13 | 2 | -3/+21 | |
| | | | | | | * | | (#5882) Added error-handling to puppet inspect when auditing | Nick Lewis | 2011-01-13 | 2 | -13/+86 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Merge branch 'ticket/2.6.next/5171-upload-files-during-inspect' into 2.6.next | Paul Berry | 2011-01-13 | 3 | -0/+101 | |
| | | | | | |\ \ | ||||||
| | | | | | | * | | (#5171) Made "puppet inspect" upload audited files to a file bucket | Paul Berry | 2011-01-13 | 3 | -0/+100 | |
| | | | | | | * | | Prep for #5171: Added a missing require to inspect application. | Paul Berry | 2011-01-13 | 1 | -0/+1 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Merge branch 'ticket/2.6.next/5838' into 2.6.next | Paul Berry | 2011-01-12 | 21 | -650/+505 | |
| | | | | | |\ \ | ||||||
| | | | | | | * | | (#5838) Support paths as part of file bucket requests. | Paul Berry | 2011-01-12 | 2 | -85/+79 | |
| | | | | | | * | | (#5838) Improve the quality of file bucket specs. | Paul Berry | 2011-01-12 | 2 | -36/+66 | |
| | | | | | | * | | (#5838) Make file bucket dipper efficient when saving a file that already exists | Paul Berry | 2011-01-12 | 2 | -1/+29 | |
| | | | | | | * | | (#5838) Implemented the "head" method for FileBucketFile::File terminus. | Paul Berry | 2011-01-12 | 6 | -445/+81 | |
| | | | | | | * | | (#5838) Reworked file dipper spec to perform less stubbing. | Paul Berry | 2011-01-12 | 1 | -82/+32 | |
| | | | | | | * | | (#5838) Added support for HEAD requests to the indirector. | Paul Berry | 2011-01-12 | 15 | -21/+247 | |
| | | | | | | * | | (#5838) Refactored error handling logic into find_in_cache. | Paul Berry | 2011-01-12 | 1 | -7/+6 | |
| | | | | | | * | | (#5838) Refactored Puppet::Network::Rights#fail_on_deny | Paul Berry | 2011-01-12 | 4 | -47/+39 | |
| | | | | | * | | | Merge branch 'maint/2.6.next/remove_unused_rakefile' into 2.6.next | Matt Robinson | 2011-01-11 | 1 | -91/+0 | |
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | |/| | | ||||||
| | | | | | | * | | maint: Remove unused Rakefile in spec directory | Matt Robinson | 2011-01-11 | 1 | -91/+0 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Merge branch 'ticket/2.6.next/5171-filebucket-diff' into 2.6.next | Paul Berry | 2011-01-11 | 5 | -3/+67 | |
| | | | | | |\ \ | ||||||
| | | | | | | * | | (#5171) Made filebucket able to perform diffs | Jesse Wolfe | 2011-01-11 | 5 | -3/+67 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Merge branch 'ticket/2.6.next/5710' into 2.6.next | Paul Berry | 2011-01-07 | 2 | -35/+64 | |
| | | | | | |\ \ | ||||||
| | | | | | | * | | (#5710) Removed unnecessary calls to insync? | Paul Berry | 2011-01-07 | 2 | -2/+28 | |
| | | | | | | * | | Prep for fixing #5710: Refactor stub provider in resource harness spec | Paul Berry | 2011-01-07 | 1 | -33/+36 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Merge branch 'maint/2.6.next/test_partial_resource_failure' into 2.6.next | Paul Berry | 2011-01-07 | 1 | -0/+58 | |
| | | | | | |\ \ | ||||||
| | | | | | | * | | Maint: test partial resource failure | Paul Berry | 2011-01-07 | 1 | -0/+58 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Merge branch 'ticket/2.6.next/5799' into 2.6.next | Nick Lewis | 2011-01-07 | 2 | -19/+32 | |
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| | | ||||||
| | | | | * | | | (#5799) Simplify report dir creation | Nick Lewis | 2011-01-06 | 2 | -19/+32 | |
| | | | |/ / / | | | |/| | | | ||||||
| | | | | * | | Merge branch 'maint/2.6.next/remove_rspec_options_from_rakefile' into 2.6.next | Matt Robinson | 2011-01-06 | 2 | -1/+3 | |
| | | | | |\ \ | | | | | |/ / | | | | |/| | | ||||||
| | | | * | | | maint: Add vim swap files to .gitignore | Matt Robinson | 2011-01-06 | 1 | -0/+1 | |
| | | | * | | | maint: Remove rspec options from the Rakefile | Matt Robinson | 2011-01-06 | 2 | -1/+2 | |
| | | |/ / / | ||||||
| | | | * | | Merge branch 'maint/2.6.next/inspect_audited_should_be_true' into 2.6.next | Matt Robinson | 2011-01-06 | 2 | -1/+27 | |
| | | | |\ \ | ||||||
| | | | | * | | maint: Inspect reports should have audited = true on events | Matt Robinson | 2011-01-06 | 2 | -1/+27 | |
| | | | |/ / | | | |/| | | ||||||
| | | | * | | Merge branch 'maint/2.6.next/add_skipped_to_resource_status' into 2.6.next | Paul Berry | 2011-01-06 | 1 | -1/+2 | |
| | | |/| | | ||||||
| | | | * | | Maint: Added "skipped" to the YAML output for Puppet::Resource::Status | Paul Berry | 2011-01-06 | 1 | -1/+2 | |
| | | |/ / | ||||||
| | | * | | Merge branch 'maint/2.6.next/5771-spec-fixes' into 2.6.next | Nick Lewis | 2011-01-05 | 4 | -96/+6 | |
| | | |\ \ | ||||||
| | | | * | | (#5771): Fix spec failures associated with rspec upgrade | Nick Lewis | 2011-01-05 | 4 | -96/+6 | |
| | | |/ / | ||||||
| | | * | | Merge branch 'ticket/2.6.next/upgrade_rspec' into 2.6.next | Nick Lewis | 2011-01-04 | 50 | -228/+83 | |
| | | |\ \ | ||||||
| | | | * | | (#5771) Upgrade rspec to version 2 | Matt Robinson | 2011-01-04 | 50 | -228/+83 | |
| | | |/ / | ||||||
| | | * | | Merge branch 'maint/2.6.next/remove_stray_p' into 2.6.next | Jesse Wolfe | 2011-01-03 | 1 | -1/+1 | |
| | | |\ \ | ||||||
| | | | * | | maint: remove stray debug statement. | Jesse Wolfe | 2011-01-03 | 1 | -1/+1 | |
| | | |/ / | ||||||
| | | * | | Merge branch 'maint/2.6.next/speed_up_slow_inspects' into 2.6.next | Jesse Wolfe | 2011-01-03 | 5 | -0/+20 | |
| | | |\ \ | ||||||
| | | | * | | maint: Prune #inspect methods on various objects | Jesse Wolfe | 2011-01-03 | 5 | -0/+20 | |
| | | * | | | Merge branch 'ticket/2.6.next/5758' into 2.6.next | Paul Berry | 2011-01-03 | 3 | -13/+64 | |
| | | |\ \ \ | | | | |/ / | | | |/| | | ||||||
| | | | * | | (#5758) Verify that report events are correctly created | Paul Berry | 2011-01-03 | 1 | -6/+56 | |
| | | | * | | Prep work for #5758: set audited=true on all audit events | Paul Berry | 2011-01-03 | 1 | -4/+6 | |
| | | | * | | Prep work for #5758: clean up initializer for Puppet::Transaction::Event | Paul Berry | 2011-01-03 | 1 | -3/+2 | |
| | | * | | | Merge branch 'ticket/2.6.next/5698' into 2.6.next | Jesse Wolfe | 2011-01-03 | 3 | -4/+31 | |
| | | |\ \ \ | | | | |/ / | | | |/| | | ||||||
| | | | * | | Fix #5698 puppet inspect shouldn't report of attributes of deleted files | Jesse Wolfe | 2011-01-03 | 3 | -4/+31 |