diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:20:28 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:20:28 -0700 |
commit | fea0b06bc828f452900943db962f4f7645bb0802 (patch) | |
tree | af2b3e2db28fb5a9de84d0b9be908950cc852d81 /lib/puppet/parser/functions/validate_re.rb | |
parent | 6b8f9dd329b40e1598fffde540b7cd59ddae9c2e (diff) | |
parent | 10c793f8f0bca08a42237bddd18100e649e80df1 (diff) |
Merge branch '2.2.x' into 2.3.x
* 2.2.x:
(#13494) Specify the behavior of zero padded strings
Update CHANGELOG, Modulefile for 2.1.3
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'lib/puppet/parser/functions/validate_re.rb')
0 files changed, 0 insertions, 0 deletions