summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | * | | | | | | 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
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '2.6.x' into nextNick Lewis2011-01-06100-1222/+938
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch '2.6.next' into 2.6.xNick Lewis2011-01-05103-1261/+958
| | | |\| | | | | | | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | 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
| | | | * | | | | | Merge branch 'ticket/2.6.next/5715' into 2.6.nextPaul Berry2010-12-3023-159/+230
| | | | |\ \ \ \ \ \
| | | | | * | | | | | (#5715) Added attributes resource_type and title to Puppet::Resource::Status.Paul Berry2010-12-302-2/+9
| | | | | * | | | | | (#5715) Removed attribute source_description from the YAML representation ofPaul Berry2010-12-302-0/+16
| | | | | * | | | | | (#5715) Removed unnecessary attributes from YAML of Puppet::Transaction::Event.Paul Berry2010-12-302-0/+18
| | | | | * | | | | | (#5715) Make certain report attributes always present.Nick Lewis2010-12-305-8/+17
| | | | | * | | | | | (#5715) Changed the type of metric names to always be strings.Paul Berry2010-12-305-44/+41
| | | | | * | | | | | (#5715) Add status attribute to reports.Paul Berry2010-12-302-6/+34
| | | | | * | | | | | (#5715) Made the report "calculate" methods strictly functional.Paul Berry2010-12-301-9/+8
| | | | | * | | | | | (#5715) Made the changes/total and events/total metrics always presentPaul Berry2010-12-302-8/+15
| | | | | * | | | | | (#5715) Refactor in preparation for adding a status attribute to reports.Paul Berry2010-12-307-60/+21
| | | | | * | | | | | (#5715) Added total time to inspect reports and made inspect metrics more con...Paul Berry2010-12-301-5/+5
| | | | | * | | | | | (#5715) Removed Puppet::Transaction::Report#external_times from YAML output.Paul Berry2010-12-302-0/+12
| | | | | * | | | | | (#5715) Added total time metric to apply reports.Paul Berry2010-12-302-0/+11
| | | | | * | | | | | (#5715) Removed redundant attribute Transaction::Event#versionPaul Berry2010-12-304-4/+4
| | | | | * | | | | | (#5715) Removed redundant attribute Resource::Status#versionPaul Berry2010-12-302-4/+4