summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-02-07Merge branch '2.2.x'Ken Barber
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-02-03Merge pull request #33 from richardc/masterJeff McCune
2012-02-03Update the documentation comment Richard Clamp
2012-01-11Merge branch '2.2.x'Jeff 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 '2.2.x'Jeff 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-11Merge branch '2.2.x'Ken Barber
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
2012-01-09Merge pull request #27 from glarizza/feature/master/str2saltedsha512Jeff McCune
2012-01-09New str2saltedsha512 function for OS X PasswordsGary Larizza
2011-12-30Merge branch '2.2.x'Jeff McCune
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-30Merge branch '2.2.x'Jeff McCune
2011-12-30Update CHANGELOG and Modulefile for 2.2.1Jeff McCune
2011-12-30Merge branch '2.2.x'Jeff 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.2.x'Jeff 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-12-30Merge branch 'v2.x'Jeff McCune
2011-11-14Merge pull request #25 from bodepd/feature/master/10802_get_module_pathKen Barber
2011-11-14(#10802) add new function get_module_pathDan Bode
2011-11-08Add note about semver.org leading v in tags.Jeff McCune
2011-11-08Merge pull request #22 from jeffmccune/maint/master/update_release_processGarrett Honeycutt
2011-11-08Update the release process instructions.Jeff 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
2011-10-25(#10285) Refactor json to use pson instead.Nan Liu
2011-10-10Merge branch 'main/mater/watchr'Jeff McCune
2011-10-10(Maint) Add watchr autotest scriptJeff McCune
2011-10-10Merge pull request #18 from jeffmccune/maint/master/make_tests_run_on_puppet_26Jeff McCune
2011-10-10(Maint) Make rspec tests work with Puppet 2.6.4Jeff McCune
2011-10-10Merge branch 'ticket/master/revert_8925'Jeff McCune
2011-10-10(#10007) Revert "Merge pull request #13 from kbarber/issue/master/8925-user_s...Jeff McCune
2011-10-04Merge pull request #13 from kbarber/issue/master/8925-user_ssl_certsJames Turnbull
2011-10-03Merge branch 'ticket/master/9859_add_root_home_fact_to_stdlib'Jeff McCune
2011-10-03(#9859) Add root_home fact and testsJeff McCune