]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 23 Jul 2012 16:00:11 +0000 (09:00 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 23 Jul 2012 16:00:11 +0000 (09:00 -0700)
* 2.2.x:
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines


Trivial merge