Merge pull request #869 from lelutin/purge_apt_conf

implement apt.conf.d purging

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df3890f62e076a0462049855ae8fadb6c4024885..fae51f13941e43f9681a80c89da1b593ef3b0794 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v7.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.1.0) (2019-07-29)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v7.0.1...v7.1.0)
+
+### Added
+
+- \(FM-8215\) Convert to using litmus [\#864](https://github.com/puppetlabs/puppetlabs-apt/pull/864) ([florindragos](https://github.com/florindragos))
+
 ## [v7.0.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v7.0.1) (2019-05-13)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/7.0.0...v7.0.1)

diff --git a/metadata.json b/metadata.json
index e46ababa6cee80feb677973fb750c9e7deb36dee..9d5f7dab8929cd1928c4ae0d29f50858b82d91d3 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "author": "puppetlabs",
   "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
   "license": "Apache-2.0",
@@ -41,6 +41,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
-  "template-ref": "heads/master-0-g2b33205",
-  "pdk-version": "1.10.0"
+  "template-ref": "heads/master-0-gb096033",
+  "pdk-version": "1.11.1"
 }

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9ee43737050ba5dbe18a16e4491cf6776834f3d5..c09e0024da88e5dc36642b80f75efdc9887a6065 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -29,6 +29,11 @@ default_fact_files.each do |f|
   end
 end
 
+# read default_facts and merge them over what is provided by facterdb
+default_facts.each do |fact, value|
+  add_custom_fact fact, value
+end
+
 RSpec.configure do |c|
   c.default_facts = default_facts
   c.before :each do