Merge pull request #566 from bmjen/2.2.0-prep

Release prep for 2.2.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7403b6fe86286c9f27823fa34f0cfaab5e5d065d..393a907db98b9eb23e39ca5945a1682b2f1bb0c0 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+##2015-09-29 - Supported Release 2.2.0
+###Summary
+
+This release includes a few bugfixes.
+
+####Features
+- Adds an `ensure` parameter for user control of proxy presence.
+- Adds ability to set `notify_update` to `apt::conf` (MODULES-2269).
+- Apt pins no longer trigger an `apt-get update` run.
+- Adds support for creating pins from main class.
+
+####Bugfixes
+- Updates to use the official Debian mirrors.
+- Fixes path to `preferences` and `preferences.d`
+- Fixes pinning for backports (MODULES-2446).
+- Fixes the name/extension of the preferences files.
+
 ##2015-07-28 - Supported Release 2.1.1
 ###Summary
 

diff --git a/metadata.json b/metadata.json
index 7c694e717e972a5f96476e9c4209d3969d1aaf2d..8632a36dfd04e14ba228c58851e3c8b6482874ea 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-apt",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "author": "Puppet Labs",
   "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
   "license": "Apache-2.0",