summaryrefslogtreecommitdiff
path: root/puppet/modules/stdlib/spec/functions/merge_spec.rb
AgeCommit message (Expand)Author
2016-05-24Merge commit '1da5dc55ee48fcd437f5b5df00a5b2f3991ec9f1' as 'puppet/modules/st...Micah
2016-05-23remove all git submodules, to replace them with subtreesMicah
2015-01-27update stdlib to latest version to address cve-2015-1029 (#6666)Micah Anderson
2013-10-30updated submodule stdlibvarac
2013-08-28updated submodule stdlib to obtain facts that show netmask in cidr notationvarac
2013-08-27updated submodule stdlib to obtain 'obfuscate_email' function (#3479)varac
2013-04-24automatic update of submodule stdlibvarac
2013-03-10automatic update of submodule stdlibvarac
2013-01-15add stdlib and unbound submodulesMicah Anderson