From e5442e92ca7e70cff1f5cdceb03c2b570915e8e9 Mon Sep 17 00:00:00 2001
From: Lucy Wyman <wyman.lucy@gmail.com>
Date: Mon, 23 Nov 2015 13:28:27 -0800
Subject: [PATCH] (maint) Prep module for new release

---
 .travis.yml   |  2 --
 CHANGELOG.md  | 17 +++++++++++++++++
 Gemfile       |  4 ++++
 metadata.json |  8 ++++++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3214dcb..64ec52d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,6 @@ script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--form
 matrix:
   fast_finish: true
   include:
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.0"
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 3.0"
     - rvm: 2.1.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9a5e807..d9561f75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+##Release 0.6.0
+###Summary
+This release includes support for new parameters, lots of unit tests, and tweaks to make sure everything works on different versions of puppet and lvm
+
+####Features
+- Update .travis.yml to run puppet 3.0 and higher
+- Add swap support
+- Add RAL to types
+- List all PVs in a VG
+- Unit tests for types
+
+####Bugfixes
+- Filesystem type can create journal devices
+- Add persistent and minor parameters to logical volume type
+- Make size_is_minsize usable
+- Add support for older lvm versions
+
 ##2015-04-28 - Release 0.5.0
 ###Summary
 
diff --git a/Gemfile b/Gemfile
index bcc115a2..8340ff8a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,4 +15,8 @@ end
 
 gem 'puppet-lint', '>= 1.0.0'
 gem 'puppet-lint-unquoted_string-check', :require => false
+
+if RUBY_VERSION < '2.0'
+      gem 'mime-types', '<3.0', :require => false
+end
 # vim:ft=ruby
diff --git a/metadata.json b/metadata.json
index e213cb12..47cc6719 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-lvm",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "author": "Puppet Labs",
   "summary": "Provides Puppet types and providers to manage Logical Resource Management (LVM) features.",
   "license": "GPLv2",
@@ -36,7 +36,11 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
+    },
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.0.0 < 2015.4.0"
     }
   ]
 }