summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-20Merge branch '2.1.x' into 2.2.xJeff McCune
2012-08-20Merge branch 'fix/2.1.x/disable_puppet26_failing_tests' into 2.1.xJeff McCune
2012-08-20Disable tests that fail on 2.6.x due to #15912Jeff McCune
2012-08-20Merge branch '2.1.x' into 2.2.xJeff McCune
2012-08-20Merge branch 'fix/2.1.x/spec_failures' into 2.1.xJeff McCune
2012-08-20(Maint) Fix mis-use of rvalue functions as statementsJeff McCune
2012-08-20Add .rspec file to repo rootJeff McCune
2012-08-10Disable tests that fail on 2.6.x due to #15912Patrick Carlisle
2012-08-09Use rvalue functions correctlyPatrick Carlisle
2012-07-23Merge pull request #81 from jeffmccune/maint/2.2.x/rename_seams_to_internalsJeff McCune
2012-07-23(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}Jeff McCune
2012-07-19Merge branch 'fix/2.2.x/make_it_green' into 2.2.xJeff McCune
2012-07-19(Maint) use PuppetlabsSpec::PuppetSeams.parser_scopeJeff McCune
2012-07-19(Maint) Fix interpreter linesJeff McCune
2012-05-11Fix spec tests using the new spec_helperJeff McCune
2012-04-04Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_init...Jeff McCune
2012-04-04Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_e...Jeff McCune
2012-04-03(#13595) initialize_everything_for_tests couples modules Puppet verEric Shamow
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try3' into 2.2.xJeff McCune
2012-03-29(#13439) Fix MRI 1.9 issue with spec_helperJeff McCune
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try2' into 2.2.xJeff McCune
2012-03-29(#13439) Fix test failures with Puppet 2.6.xJeff McCune
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper' into 2.2.xJeff McCune
2012-03-29(#13439) refactor spec helper for compatibility with both puppet 2.7 andcprice
2012-03-29Merge branch '2.1.x' into 2.2.xJeff McCune
2012-03-29Merge branch 'maint/2.2.x/range_spec_tests' into 2.2.xJeff McCune
2012-03-29(#13494) Specify the behavior of zero padded stringsJeff McCune
2012-03-29Update CHANGELOG, Modulefile for 2.1.3Jeff McCune
2012-02-07Merge branch '2.1.x' into 2.2.xKen Barber
2012-02-06Merge branch 'ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_b...Ken Barber
2012-02-06(#12377) Avoid infinite loop when retrying require jsonJeff McCune
2012-01-11Merge branch 'bug/2.2.x/is_domain_name' into 2.2.xJeff McCune
2012-01-11Check according to rfc1035Stig Sandbeck Mathisen
2012-01-11Add additional domain name testsJeff McCune
2012-01-11(maint) Memoize scope in domain_name specJeff McCune
2012-01-11Merge branch 'ticket/2.2.x/11901-rspec_sort_order' into 2.2.xJeff McCune
2012-01-11(#11901) Fix sort order error in tests for 'keys' and 'values'Jeff McCune
2012-01-10Merge pull request #28 from kbarber/ticket/2.2.x/11873-time_spec_failureDaniel Pittman
2012-01-10(#11873) time function spec failure on Fixnum matcherKen Barber
2011-12-30Merge branch '2.1.x' into 2.2.xJeff McCune
2011-12-30Merge pull request #26 from jeffmccune/ticket/2.1.x/11607_fix_ci_tests_for_st...Jeff McCune
2011-12-30(#11607) Add Rakefile to enable spec testingJeff McCune
2011-12-30Update CHANGELOG and Modulefile for 2.2.1Jeff McCune
2011-12-30Merge branch '2.1.x' into 2.2.xJeff McCune
2011-12-30Update Modulefile CHANGELOG for v2.1.2 releaseJeff McCune
2011-12-30Merge branch 'v2.1.x' into v2.2.xJeff McCune
2011-12-30(maint) Add semantic versioning info to READMEJeff McCune
2011-11-08Merge pull request #21 from puppetlabs/v2.2Garrett Honeycutt
2011-11-08 * v2.x:James Turnbull
2011-10-25Merge pull request #19 from nanliu/ticket/10285Ken Barber