diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-27 17:08:20 -0800 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-27 17:08:20 -0800 |
commit | e4aa3473249d1019de788bef893a1bca77bf9639 (patch) | |
tree | c033f5935f168ea959223f80c1757d24c44cb6d3 /lib/puppet/parser | |
parent | 2b593625b641818889ec14a8598cce7b752efedc (diff) | |
parent | be6d45632511cfb04748c8bcbe1e8a4831f3755b (diff) |
Merge branch '3.x' into 4.x
* 3.x:
Revert "(Maint) Add spec/functions to rake test task"
Diffstat (limited to 'lib/puppet/parser')
0 files changed, 0 insertions, 0 deletions