From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 24 Feb 2014 21:36:48 +0000 (-0800)
Subject: Merge branch '1.4.x'
X-Git-Tag: 1.5.0~42
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=944f9d5064382a3ab9ea5582d512e78950d5f8c0;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch '1.4.x'
---

944f9d5064382a3ab9ea5582d512e78950d5f8c0
diff --cc manifests/ppa.pp
index 14fbbce,7ec6b20..bc8d486
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@@ -1,10 -1,10 +1,10 @@@
  # ppa.pp
  
  define apt::ppa(
 +  $ensure  = 'present',
    $release = $::lsbdistcodename,
-   $options = '-y'
+   $options = $apt::params::ppa_options,
  ) {
 -  $ensure  = 'present'
    include apt::params
    include apt::update