]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.x' into 3.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 26 Nov 2012 19:41:01 +0000 (11:41 -0800)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 26 Nov 2012 19:41:01 +0000 (11:41 -0800)
* 2.x:
  (#14670) Fixup file_line autorequire specs
  (#14670) autorequire a file_line resource's path


Trivial merge