From: Hunter Haugen <hunter@puppet.com>
Date: Wed, 26 Apr 2017 18:34:24 +0000 (-0700)
Subject: Merge branch 'master' into release
X-Git-Tag: 4.0.0^0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e9dadf5ed3308655d003374c4b2c2f5fe8619c27;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'master' into release
---

e9dadf5ed3308655d003374c4b2c2f5fe8619c27
diff --cc manifests/source.pp
index ad80977,9cb2133..a9769ea
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@@ -50,13 -99,13 +50,13 @@@ define apt::source
    $header = epp('apt/_header.epp')
  
    $sourcelist = epp('apt/source.list.epp', {
-     'comment'        => $comment,
-     'includes'       => $includes,
-     'architecture'   => $architecture,
-     'allow_unsigned' => $allow_unsigned,
-     'location'       => $location,
-     'release'        => $_release,
-     'repos'          => $repos,
+     'comment'          => $comment,
+     'includes'         => $includes,
+     'opt_architecture' => $architecture,
 -    'allow_unsigned'   => $_allow_unsigned,
++    'allow_unsigned'   => $allow_unsigned,
+     'location'         => $location,
+     'release'          => $_release,
+     'repos'            => $repos,
    })
  
    apt::setting { "list-${name}":