]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '4.3.x'
authorTravis Fields <travis@puppetlabs.com>
Tue, 4 Nov 2014 22:17:03 +0000 (14:17 -0800)
committerTravis Fields <travis@puppetlabs.com>
Tue, 4 Nov 2014 22:17:03 +0000 (14:17 -0800)
commit4bff0d2d61b8b31cd132fdc7896f115ef2b96770
tree5d23f9b06e0f55680235f04900a06a8a6952f8d2
parent35c2dc7ca340c106872459788c167d04140158ca
parent2f3d426ba7ad2c3055e4774aa71c77c65e866c43
Merge branch '4.3.x'

Conflicts:
spec/acceptance/ensure_packages_spec.rb
spec/acceptance/ensure_resource_spec.rb
spec/acceptance/ensure_resource_spec.rb