]> review.fuel-infra Code Review - puppet-modules/puppetlabs-apt.git/commitdiff
Code Review / puppet-modules / puppetlabs-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 98d1646 c77a2f4)
Merge branch '1.5.x' into merge
authorAshley Penney <ashley.penney@puppetlabs.com>
Thu, 3 Jul 2014 17:08:11 +0000 (13:08 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Thu, 3 Jul 2014 17:08:11 +0000 (13:08 -0400)
Conflicts:
Gemfile
spec/acceptance/apt_key_provider_spec.rb

1  2 
manifests/init.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/init.pp
Simple merge