]> 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: 88eb872 fa86d8e)
Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 22 Jul 2015 23:27:54 +0000 (16:27 -0700)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 22 Jul 2015 23:27:54 +0000 (16:27 -0700)

Trivial merge