Merge branch '1.4.x'

diff --cc manifests/ppa.pp
index 14fbbceba41089f3e7ee683724c748c8c65c5941,7ec6b20375d37358a096fa7cc0765923fe78401f..bc8d486007980a1770884ffa91d8bce06b90b421
--- 1/manifests/ppa.pp
--- 2/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
  

diff --cc spec/acceptance/apt_ppa_spec.rb
Simple merge