From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 26 Nov 2012 19:41:01 +0000 (-0800)
Subject: Merge branch '2.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0648148bfb70159dcf2eb2af3d8e67842ce96f85;p=puppet-stdlib.git

Merge branch '2.x' into 3.x

* 2.x:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path
---

0648148bfb70159dcf2eb2af3d8e67842ce96f85