Merge pull request #553 from bmjen/2.1.x_mergeback

2.1.x mergeback

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d7838238f40869beb5b9cf62afaba2a60541cc6..7403b6fe86286c9f27823fa34f0cfaab5e5d065d 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+##2015-07-28 - Supported Release 2.1.1
+###Summary
+
+This release includes a few bugfixes.
+
+####Bugfixes
+- Fix incorrect use of anchoring (MODULES-2190)
+- Use correct comment type for apt.conf files
+- Test fixes
+- Documentation fixes
+
 ##2015-06-16 - Supported Release 2.1.0
 ###Summary
 

diff --git a/README.md b/README.md
index 1312980dc1c24cd5fa1eab203030333b3aa5aedb..950649539efa8e31cd7ca82e0e7d6e8023c249b1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Apt (Advanced Package Tool) is a package manager available on Debian, Ubuntu, an
 * System repositories
 * Authentication keys
 
-**Note:** This module offers `purge` parameters which will cause the module to destroy any configuration on the node's `sources.list(.d)` and `preferences.list(.d)` that you haven't declared through Puppet. The default for these parameters is 'false'.
+**Note:** This module offers `purge` parameters which, if set to 'true', **destroy** any configuration on the node's `sources.list(.d)` and `preferences.list(.d)` that you haven't declared through Puppet. The default for these parameters is 'false'.
 
 ### Beginning with apt
 
@@ -458,7 +458,7 @@ This module is tested and officially supported on Debian 6 and 7 and Ubuntu 10.0
 
 ### Adding new sources or PPAs
 
-If you are adding a new source or PPA and trying to install packages from the new source or PPA on the same puppet run, in addition to depending on the `Apt::Source` or the `Apt::Ppa`, your `package` resource should depend on `Class['apt::update']`. You can also add [collectors](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html) to ensure all packages happen after `apt::update`, but this can lead to dependency cycles and has implications for [virtual resources](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html#behavior)
+If you are adding a new source or PPA and trying to install packages from the new source or PPA on the same Puppet run, your `package` resource should depend on `Class['apt::update']`, in addition to depending on the `Apt::Source` or the `Apt::Ppa`. You can also add [collectors](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html) to ensure that all packages happen after `apt::update`, but this can lead to dependency cycles and has implications for [virtual resources](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html#behavior).
 
 ~~~puppet
 Class['apt::update'] -> Package<| |>

diff --git a/metadata.json b/metadata.json
index 9675c3a38dec8f3b9b24601de2f75c05dd8ed35b..7c694e717e972a5f96476e9c4209d3969d1aaf2d 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "author": "Puppet Labs",
   "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.3.0 < 5.0.0"
+      "version_requirement": ">= 3.3.0 < 2015.3.0"
     },
     {
       "name": "puppet",