summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-11-07 14:03:22 -0800
committerJeff McCune <jeff@puppetlabs.com>2012-11-07 14:03:22 -0800
commitb97e053cad947ed712ba3f23400e7f5add56ccd1 (patch)
tree0a7a4c93337b21bbec4a1eb330dd66bfa4b0382a /Rakefile
parentbe71219f128b62ddc61c07d47b0b6dd9ccd6d523 (diff)
parentf8635584a8fa8456186f04b3ace10bdcd9b5a886 (diff)
Merge branch '2.x' into 3.x
* 2.x: (#13974) Add predicate functions for interface facts
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions