summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* (#6820) Fix nagios parser to use proper hash syntax for Ruby 1.9Matt Robinson2011-03-231-1/+1
* (#6820) Fix Invalid multibyte characterMatt Robinson2011-03-231-1/+1
* (#6820) Fix RDOC parser to work with Ruby 1.9Matt Robinson2011-03-231-3/+9
* (#6820) Fix invalid next that should be a returnMatt Robinson2011-03-231-1/+1
* (#2782) Fix constant_defined?Matt Robinson2011-03-231-1/+13
* Merge branch 'feature/next/6527-pip_package_provider' into nextMatt Robinson2011-03-221-4/+5
|\
| * (#6527) Fix pip testsMatt Robinson2011-03-221-4/+5
* | Merge branch 'feature/next/6257-pip_package_provider' into nextMatt Robinson2011-03-222-0/+285
|\|
| * (#6527) Fix uninstall problem and refactorMatt Robinson2011-03-222-68/+48
| * (#6527) Added pip package provider.Richard Crowley2011-03-222-0/+305
* | Merge branch 'ticket/next/maint-fix_require_spec_helper_for_ruby_19' into nextMatt Robinson2011-03-2263-66/+65
|\ \ | |/ |/|
| * maint: Change code for finding spec_helper to work with Ruby 1.9Matt Robinson2011-03-2262-63/+62
| * Fix error "invalid multibyte char (US-ASCII)" under Ruby 1.9Matt Robinson2011-03-221-3/+3
|/
* Merge branch 'ticket/next/6566' into nextMatt Robinson2011-03-222-54/+55
|\
| * (#6566) Replace tabs with spacesMatt Robinson2011-03-221-50/+50
| * (#6566) Fix ruby 1.9 incompatible case statementMatt Robinson2011-03-221-2/+2
| * Fixed #6566 Replace ftools with filetuils in rake gem taskJames Turnbull2011-03-221-4/+5
|/
* Merge branch 'ticket/next/6555' into nextMatt Robinson2011-03-225-7/+7
|\
| * (#6555) Fix another ruby 1.9 incompatible case statementMatt Robinson2011-03-221-1/+1
| * Fixed #6555 - Fixed two more when then colon issuesJames Turnbull2011-03-222-2/+2
| * Fixed #6555 - Ruby 1.9.x returning Invalid next (SyntaxError)James Turnbull2011-03-221-1/+1
| * Fixed #6555 - Ruby 1.9.x warning: class variable access from toplevelJames Turnbull2011-03-221-3/+3
|/
* Merge branch 'ticket/next/maint-silence_false_test_output' into nextMatt Robinson2011-03-181-2/+3
|\
| * maint: Silence test output in the spec runMatt Robinson2011-03-181-2/+3
|/
* Merge branch 'next'Matt Robinson2011-03-18283-5524/+9119
|\
| * Merge branch '2.6.x' into nextMatt Robinson2011-03-1854-172/+1033
| |\
| | * Updated CHANGELOG for 2.6.7rc1Matt Robinson2011-03-162-2/+107
| | * Merge branch '2.6.next' into 2.6.xMatt Robinson2011-03-16137-2825/+4454
| | |\
| | | * Merge branch 'ticket/2.6.next/5073' into 2.6.nextMatt Robinson2011-03-163-11/+31
| | | |\
| | | | * (#5073) Download plugins even if you're filtering on tagsMatt Robinson2011-03-153-11/+31
| | | * | Merge branch 'ticket/2.6.next/5610' into 2.6.nextJesse Wolfe2011-03-152-2/+13
| | | |\ \
| | | | * | Fix #5610: Prevent unnecessary RAL lookupsJesse Wolfe2011-03-152-2/+13
| | | |/ /
| | | * | Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet...Jesse Wolfe2011-03-154-24/+6
| | | * | Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2....Jesse Wolfe2011-03-154-6/+24
| | | |\ \
| | | | * | (#5605) Prefetch doesnt work with composite keysStefan Schulte2010-12-234-6/+24
| | | * | | Merge branch 'ticket/2.6.next/6723-withenv-bug' into 2.6.nextMax Martin2011-03-152-5/+53
| | | |\ \ \
| | | | * | | (#6723) Fix withenv environment restoration bugMax Martin2011-03-152-5/+53
| | | |/ / /
| | | * | | Merge branch '2.6.next' of github.com:puppetlabs/puppet into 2.6.nextMax Martin2011-03-1511-49/+67
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge branch 'ticket/2.6.next/5428-handle-0.25.x-storedconfig-data' into 2.6....Jacob Helwig2011-03-152-18/+43
| | | | |\ \
| | | | | * | Remove extra trailing whitespace from lib/puppet/resource.rbJacob Helwig2011-03-151-1/+1
| | | | | * | (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigsJacob Helwig2011-03-152-18/+43
| | | | * | | Merge branch 'ticket/2.6.next/6689' into 2.6.nextNick Lewis2011-03-151-1/+0
| | | | |\ \ \
| | | | | * | | (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecordNick Lewis2011-03-151-1/+0
| | | | * | | | Merge branch 'ticket/2.6.x/5662' of https://github.com/stschulte/puppet into ...Jesse Wolfe2011-03-142-1/+4
| | | | |\ \ \ \
| | | | | * | | | (#5662) Fixed tests that didnt stub key_attributesStefan Schulte2010-12-232-0/+2
| | | | | * | | | (#5662) Parsedfile doesnt work with mult keyattrStefan Schulte2010-12-231-1/+3
| | | | | | |_|/ | | | | | |/| |
| | | | * | | | Merge branch 'ticket/2.6.x/5661' of https://github.com/stschulte/puppet into ...Jesse Wolfe2011-03-141-4/+4
| | | | |\ \ \ \
| | | | | * | | | (#5661) Creating types dont work with >1 namevarStefan Schulte2010-12-231-4/+4
| | | | | |/ / /
| | | | * | | | Merge branch 'ticket/2.6.next/6707' into 2.6.nextnfagerlund2011-03-141-1/+1
| | | | |\ \ \ \
| | | | | * | | | (#6707) Fix typo in rest_authconfig.rbnfagerlund2011-03-141-1/+1
| | | | |/ / / /