]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commitf3caf5f49383344228482b93ad533d06244a3cac
tree9144840436f9aba8d14313ad5c26bb59c6cb5d80
parent730aee4ef999b73a16d13a6792e10343dbdcabea
parenta1bab586ba6fcf2b3035898d1002d0a6ef89d7c8
Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x

* 2.2.x:
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines