summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-05-28 11:03:51 -0700
committerAdrien Thebo <git@somethingsinistral.net>2013-05-28 11:07:41 -0700
commit0f2d69fdfd9563aeef1bae0aadb1d12aab0d25c0 (patch)
tree88519e78cc056dbdacf059d7f785a2b3f8d76b20 /manifests
parent9c8c8275abd76878d38a0f6f3af52dc468656283 (diff)
parent4732676548f91a43bc67ea0b70abdd34cae093c1 (diff)
downloadpuppet-stdlib-0f2d69fdfd9563aeef1bae0aadb1d12aab0d25c0.tar.gz
puppet-stdlib-0f2d69fdfd9563aeef1bae0aadb1d12aab0d25c0.tar.bz2
Merge remote-tracking branch 'pr/56' into pull-56
Conflicts: lib/puppet/parser/functions/range.rb spec/unit/puppet/parser/functions/range_spec.rb
Diffstat (limited to 'manifests')
0 files changed, 0 insertions, 0 deletions