summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixing Indirector::Facts::Couch loadingLuke Kanies2011-04-092-66/+74
* Fixing dependency loading in Rails::FactNameLuke Kanies2011-04-091-0/+1
* Fixing 'puppet faces' applicationLuke Kanies2011-04-092-16/+15
* Fixing the watchr scriptLuke Kanies2011-04-092-4/+2
* Fixing FaceCollection#facesLuke Kanies2011-04-091-3/+1
* Merge branch 'ticket/next/maint-fix_sqlite_test' into nextMatt Robinson2011-04-081-1/+5
|\
| * maint: Fix sporadic sqlite errorMatt Robinson2011-04-081-0/+1
| * maint: Fix sqlite3 require to really be optionalMatt Robinson2011-04-081-1/+4
|/
* Merge branch 'maint/next/clean-up-spec_helper-require' into nextDaniel Pittman2011-04-08440-453/+442
|\
| * maint: just require 'spec_helper', thanks rspec2Daniel Pittman2011-04-08440-453/+442
|/
* Merge branch 'maint/next/improve-test-suite-performance' into nextDaniel Pittman2011-04-084-109/+44
|\
| * maint: delete dead darwinport package providerDaniel Pittman2011-04-081-86/+0
| * maint: don't take over signal handling in tests...Daniel Pittman2011-04-081-0/+7
| * maint: use FileUtil to remove files, not execDaniel Pittman2011-04-081-23/+33
| * maint: disable garbage collector during individual test cases.Daniel Pittman2011-04-081-0/+4
|/
* Merge branch 'ticket/next/maint-fix_tests_for_old_rubies' into nextMatt Robinson2011-04-082-5/+5
|\
| * maint: Ruby < 1.8.7 knows size but not countMatt Robinson2011-04-081-4/+4
| * maint: Get tests passing on Ruby < 1.8.7Matt Robinson2011-04-081-1/+1
* | Merge branch 'ticket/next/7026' into nextNick Lewis2011-04-082-0/+25
|\ \ | |/ |/|
| * (#7026) Remove whits from reports when finalizingNick Lewis2011-04-082-0/+25
* | Merge branch 'ticket/next/maint-backport_array_combination' into nextMatt Robinson2011-04-082-0/+37
|\ \
| * | maint: Add Array combinations methodMatt Robinson2011-04-082-0/+37
|/ /
* | maint: mark tests pending for a discovered bug...Daniel Pittman2011-04-082-0/+4
* | Merge puppet-interfaces into puppet.Daniel Pittman2011-04-0774-0/+2853
|\ \
| * | maint: mocking 'require' causes random stack-overflow failures.Daniel Pittman2011-04-071-0/+1
| * | (#6969) String failures differentiate between invalid string/versionDan Bode2011-04-071-1/+10
| * | (#6985) Allows indirectors to accept a hash as an argument.Dan Bode2011-04-072-3/+7
| * | (#7005) added require 'tmpdir' to spec helper.Dan Bode2011-04-071-0/+1
| * | Merge branch 'refactor/master/7012-rename-strings-to-interfaces-and-faces'Daniel Pittman2011-04-0779-634/+623
| |\ \
| | * | (#7012) Split plumbing into Puppet::InterfaceDaniel Pittman2011-04-0725-270/+259
| | * | (#7012) Update references in code to use face(s)Daniel Pittman2011-04-0756-398/+398
| | * | (#7012) global rename of strings to faces.Daniel Pittman2011-04-0749-0/+0
| |/ /
| * | Merge branch 'bug/master/7006-missing-require'Daniel Pittman2011-04-071-0/+2
| |\ \
| | * | (#7006) Add a missing require to puppet/string/option.rbDaniel Pittman2011-04-071-0/+2
| |/ /
| * | Merge branch 'bug/master/6972-setting-CA-location-for-cert-string-no-longer-w...Daniel Pittman2011-04-067-25/+93
| |\ \
| | * | (#6983) mark test pending until string is fixed...Daniel Pittman2011-04-062-4/+3
| | * | (#6972) Handle ca-location in the certificate string.Daniel Pittman2011-04-064-21/+41
| | * | (#6972) Recognize puppet global options in pre-parse.Daniel Pittman2011-04-062-1/+50
| | * | (#6972) Clean up OptParse name extraction a little.Daniel Pittman2011-04-061-2/+2
| |/ /
| * | Merge branch 'bug/master/6995-current-is-not-always-calculated-correctly'Daniel Pittman2011-04-064-78/+135
| |\ \
| | * | (#6995) Fix indexing of :current on string load.Daniel Pittman2011-04-063-52/+89
| | * | maint: add `write_scratch_string` helper for testing...Daniel Pittman2011-04-061-1/+15
| | * | maint: whitespace cleanup for spec_helper.Daniel Pittman2011-04-061-17/+19
| | * | (#6995) more robust testing of string loadingDaniel Pittman2011-04-061-15/+19
| |/ /
| * | Merge branch 'tickets/master/6982'Pieter van de Bruggen2011-04-051-1/+3
| |\ \
| | * | (#6982) Patch the Certificate String against (#5528).Pieter van de Bruggen2011-04-051-1/+3
| |/ /
| * | Merge branch 'feature/master/6749-actions-need-to-support-options'Daniel Pittman2011-04-042-6/+14
| |\ \
| | * | (#6949) Fix passing positional arguments to actions.Daniel Pittman2011-04-042-6/+14
| |/ /
| * | Merge branch 'refactor/master/6964-when_invoked-rather-than-invoke-in-actions'Daniel Pittman2011-04-0416-56/+57
| |\ \
| | * | (#6964) use 'when_invoked' rather than 'invoke' for actions.Daniel Pittman2011-04-0416-56/+57
| |/ /