From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 15 Oct 2013 17:44:04 +0000 (-0700)
Subject: Merge pull request #173 from apenney/140-release
X-Git-Tag: 1.4.0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=924e89289b93db60ef0f16a4e71579fa88e037a6;hp=6d01635dbdd2bcb3989dfdb64ac2b6cc020e59d3;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #173 from apenney/140-release

Prepare 1.4.0 release.
---

diff --git a/CHANGELOG b/CHANGELOG
index 25b0ec2..0d321bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,16 @@
-## puppetlabs-apt changelog
+2013-10-08 1.4.0
 
-Release notes for the puppetlabs-apt module.
+Summary:
+
+Minor bugfix and allow the timeout to be adjusted.
+
+Features:
+- Add an `updates_timeout` to apt::params
+
+Fixes:
+- Ensure apt::ppa can readd a ppa removed by hand.
+
+Summary
 
 1.3.0
 =====
diff --git a/Modulefile b/Modulefile
index a73f20b..72aa142 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-apt'
-version '1.3.0'
+version '1.4.0'
 source  'https://github.com/puppetlabs/puppetlabs-apt'
 author  'Evolving Web / Puppet Labs'
 license 'Apache License 2.0'