]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
projects / puppet-stdlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cc414a4 effdfb8)
Merge branch '2.3.x'
authorJeff McCune <jeff@puppetlabs.com>
Mon, 23 Jul 2012 22:59:52 +0000 (15:59 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 23 Jul 2012 22:59:52 +0000 (15:59 -0700)
commit243c7c2a499697654101af726f1f47d367e41c13
tree855d07f105866afbb26f5e093997a7d5f295e408tree | snapshot
parentcc414a422de0d773a1012ca57f41f15b4d6caf06commit | diff
parenteffdfb845092fbe549c286926ac686aab1746a12commit | diff
Merge branch '2.3.x'

* 2.3.x:
  (Maint) Don't mock with mocha
  (Maint) Fix up the get_module_path parser function
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines

Conflicts:
spec/spec_helper.rb
spec/unit/puppet/parser/functions/get_module_path_spec.rb
spec/spec_helper.rb diff1 | diff2 | blob | history
Puppet module for stdlib