Merge pull request #173 from apenney/140-release

Prepare 1.4.0 release.

diff --git a/CHANGELOG b/CHANGELOG
index 25b0ec2419926a9e09e8efcce9e9c49c4c22c81e..0d321bc2990ea0ad1b7c4fbc5a1ca91242ed8365 100644 (file)
--- 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 a73f20bf5a09873fbb165820beb94eddd54e0ebb..72aa142e5fe41018acadb8b312d6c9dccf52ae70 100644 (file)
--- 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'