summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| |\
| | * (#4943) Add puppet inspect applicationNick Lewis2010-12-024-2/+170
| |/ |/|
| * Merge branch 'ticket/2.6.next/5261' into 2.6.nextMatt Robinson2010-12-022-22/+16
| |\
| | * (#5261) Fix #5261 Don't escape Unicode characters in PSONJesse Wolfe2010-12-022-22/+16
| * | Merge branch 'maint/2.6.next/bogus_mongrel_daemonize_test' into 2.6.nextMatt Robinson2010-12-021-6/+0
| |\ \ | | |/ | |/|
| | * maint: Remove bogus mongrel testMatt Robinson2010-12-021-6/+0
| |/
| * Merge branch 'ticket/2.6.next/5081' into 2.6.nextMatt Robinson2010-12-012-9/+0
|/|
| * [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading...Matt Robinson2010-12-012-9/+0
|/
* (#5304) Use internal_name rather than real_name for maillist providerNigel Kersten2010-12-011-5/+3
* Updated CHANGELOG and version for 2.6.4James Turnbull2010-12-022-1/+10
* Revert "(#5304) Use internal_name rather than real_name for maillist provider"James Turnbull2010-12-021-5/+6
* Disable remote ralsh by defaultPaul Berry2010-12-022-2/+0
* (#5424) Ship auth.conf as part of installing from sourceNigel Kersten2010-12-021-7/+38
* (#5304) Use internal_name rather than real_name for maillist providerNigel Kersten2010-11-301-6/+5
* Renamed Reductive to PuppetJames Turnbull2010-11-2922-24/+24
* Incremented CHANGELOG for 2.6.3James Turnbull2010-11-171-0/+16
* [#5322] (#5322) Remove spec file that adds little value and causes failuresMatt Robinson2010-11-161-533/+0
* Fix test failures that fixing #4726 exposed.Jesse Wolfe2010-11-163-11/+11
* (#4726) Fix RRD legacy supportMatt Robinson2010-11-161-1/+1
* Fix for #4279 -- mount detection on HP-UXMarkus Roberts2010-11-162-2/+9
* Fix for #5055 -- adding to_sym to Puppet::Node::EnvironmentMarkus Roberts2010-11-161-0/+4
* Fix for #5298 -- Collections need to do type lookupMarkus Roberts2010-11-162-1/+6
* Step towards [5298] -- cleanup indentation, etc. in AST::CollectionMarkus Roberts2010-11-161-51/+33
* Fixed #5287 - Schedule documentation is incorrectJames Turnbull2010-11-161-5/+5
* Fixed #5296 - test warnings messagesJames Turnbull2010-11-165-14/+14