]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit0648148bfb70159dcf2eb2af3d8e67842ce96f85
treebfff79695287950689959ffae1f36819fda4b0aa
parentad262b56a432a17bfde66f39b3d6042e2a35eea0
parentb55994b2be55c3f03bc089449d07ecef69ec7638
Merge branch '2.x' into 3.x

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