summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | | | | (#5715) Removed Puppet::Util::Log#version.Paul Berry2010-12-309-23/+29
| | | | | * | | | | | (#5715) Removed the unused attribute Puppet::Transaction::Event#nodePaul Berry2010-12-302-2/+2
| | | | | * | | | | | (#5715) Removed Resource::Status#skipped_reason. It was never used.Paul Berry2010-12-302-2/+2
| | | | | * | | | | | (#5715) Prep work: Fixed add_statuses in report_spec.Paul Berry2010-12-301-1/+1
| | | | |/ / / / / /
| | | | * | | | | | Merge branch 'ticket/2.6.next/5723' into 2.6.nextNick Lewis2010-12-291-3/+3
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | | * | | | | (#5723) Fix failing type/package specsNick Lewis2010-12-291-3/+3
| | | | * | | | | | Merge branch 'ticket/2.6.next/5169' into 2.6.nextJesse Wolfe2010-12-207-12/+132
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Implement #5168 and #5169 ctime and mtime are propertiesJesse Wolfe2010-12-207-12/+132
| | | | |/ / / / / /
| | | | * | | | | | Merge branch 'ticket/2.6.next/3782' into 2.6.nextPaul Berry2010-12-171-1/+4
| | | | |\ \ \ \ \ \
| | | | | * | | | | | [3782] Test isolation problem in test/ral/providers/cron/crontab.rbPaul Berry2010-12-171-1/+4
| | | | |/ / / / / /
| | | | * | | | | | Merge branch 'maint/2.6.next/5408' into 2.6.nextPaul Berry2010-12-178-680/+315
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Modified the behavior of Puppet::Resource::Status as follows:Paul Berry2010-12-174-11/+62
| | | | | |/ / / / /
| | | | | * / / / / (#5408) Reworked ResourceHarness so that code is clearer and all behaviors ar...Paul Berry2010-12-178-680/+264
| | | | |/ / / / /
| | | | * | | | | Merge branch 'ticket/2.6.next/5493' into 2.6.nextNick Lewis2010-12-1615-91/+77
| | | | |\ \ \ \ \
| | | | | * | | | | (#5493) Add report_format, puppet_version, and configuration_version to ReportsNick Lewis2010-12-1613-58/+60
| | | | | * | | | | (#5375) Rework puppet apply to use configurer.runPaul Berry2010-12-164-33/+17
| | | | |/ / / / /
| | | | * | | | | Merge branch 'ticket/2.6.4/5566' into 2.6.nextJesse Wolfe2010-12-162-1/+20
| | | | |\ \ \ \ \
| | | | | * | | | | Fix #5566 none, mtime, and ctime checksum types can write file contentsJesse Wolfe2010-12-162-1/+20
| | | | | | |/ / / | | | | | |/| | |
| * | | | | | | | Merge branch 'maint/next/mocha_workaround' into nextNick Lewis2011-01-063-2/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | maint: Work-around for a Mocha bugNick Lewis2011-01-063-2/+27
| |/ / / / / / /
* | | | | | | | Merge branch 'next'Matt Robinson2010-12-161-12/+15
|\| | | | | | |
| * | | | | | | Merge branch '2.6.x' into nextMatt Robinson2010-12-161-12/+15
| |\| | | | | |
| | * | | | | | Merge branch '2.6.next' into 2.6.xMatt Robinson2010-12-1616-12/+30
| | |\| | | | |
| | | * | | | | Merge branch 'ticket/2.6.next/maint-fix_active_record_confine' into 2.6.nextMatt Robinson2010-12-161-12/+15
| | | |\ \ \ \ \
| | | | * | | | | maint: Fix ActiveRecord confine issueMatt Robinson2010-12-161-12/+15
| | | |/ / / / /
| | | * | | | | Merge branch 'maint/2.6.next/fix-test-dependency-problems' into 2.6.nextNick Lewis2010-12-1615-0/+15
| | | |\ \ \ \ \
| | | | * | | | | maint: Fix a test that was missing a requireMatt Robinson2010-12-162-0/+2
| | | | * | | | | maint: Fix tests that don't run on their ownMatt Robinson2010-12-1613-0/+13
| | | |/ / / / /
* | | | | | | / Merge branch 'next'Nick Lewis2010-12-16515-1578/+1735
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch '2.6.x' into nextNick Lewis2010-12-1629-226/+492
| |\| | | | |
| | * | | | | Merge branch '2.6.next' into 2.6.xNick Lewis2010-12-1633-256/+507
| | |\| | | | | | | |_|/ / | | |/| | |
| | | * | | Merge branch 'ticket/2.6.next/4487' into 2.6.nextNick Lewis2010-12-132-12/+27
| | | |\ \ \
| | | | * | | (#4487) Fix environment column in hosts tableNick Lewis2010-12-132-12/+27
| | | * | | | Merge branch 'maint/2.6.next/safe-pluginhandler' into 2.6.nextJesse Wolfe2010-12-132-1/+5
| | | |\ \ \ \
| | | | * | | | maint: restore plugin handler safetyJesse Wolfe2010-12-132-1/+5
| | | |/ / / /
| | | * | | | Merge branch 'ticket/2.6.next/5408' into 2.6.nextJesse Wolfe2010-12-108-139/+253
| | | |\ \ \ \
| | | | * | | | (#5408) Attributes can be both audited and managedJesse Wolfe2010-12-108-139/+253
| | | |/ / / /
| | | * | | | Merge branch 'maint/2.6.next/fix-silent-mocha-failures' into 2.6.nextJesse Wolfe2010-12-108-12/+13
| | | |\ \ \ \
| | | | * | | | maint: missing stubJesse Wolfe2010-12-101-0/+1
| | | | * | | | maint: missing stubJesse Wolfe2010-12-101-1/+1
| | | | * | | | maint: missing line and filename stubsJesse Wolfe2010-12-101-1/+1
| | | | * | | | maint: Fully stub partially stubbed test.Jesse Wolfe2010-12-101-0/+2
| | | | * | | | maint: remove Puppet.settings stubsJesse Wolfe2010-12-101-5/+5
| | | | * | | | maint: test was expecting Catalog.find too few timesJesse Wolfe2010-12-101-1/+1
| | | | * | | | maint: broken test not failing due to over-eager exception catchingJesse Wolfe2010-12-102-4/+2
| | | |/ / / /
| | | * | | | Merge branch 'ticket/2.6.next/1757' into 2.6.nextJesse Wolfe2010-12-087-52/+22
| | | |\ \ \ \
| | | | * | | | Fix #1757 Change file mode representation to octalJesse Wolfe2010-12-087-52/+22
| | | | |/ / /
| | | * | | | Merge branch 'ticket/next/5423' into 2.6.nextPaul Berry2010-12-061-5/+5
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Bug #5423: This moves the home directory property before the uid property, th...Jonathan Boyett2010-12-061-5/+5
| | | |/ / /
| | | * | | Merge branch 'ticket/2.6.next/4943' into 2.6.nextNick Lewis2010-12-024-2/+170
| | | |\ \ \