summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-11-27 17:08:12 -0800
committerJeff McCune <jeff@puppetlabs.com>2012-11-27 17:08:12 -0800
commitbe6d45632511cfb04748c8bcbe1e8a4831f3755b (patch)
tree07f35bdc5f79201f3387424e940e95b5629580e9
parentaa1e743e385d7f7b1a4e948564e03231ab535e97 (diff)
parent59cc85deb509c1c91ea41c314edf73ac59ea2780 (diff)
downloadpuppet-stdlib-be6d45632511cfb04748c8bcbe1e8a4831f3755b.tar.gz
puppet-stdlib-be6d45632511cfb04748c8bcbe1e8a4831f3755b.tar.bz2
Merge branch '2.x' into 3.x
* 2.x: Revert "(Maint) Add spec/functions to rake test task" Conflicts: Rakefile
0 files changed, 0 insertions, 0 deletions