v3.1.0 release

* Add blacksmith tooling for tagging
voxpupuli · May 19, 2017 · 7fae720 · 7fae720
1 parent 26d5ed0
commit 7fae720
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -62,7 +62,7 @@ deploy:
   provider: puppetforge
   user: arioch
   password:
-    secure: GKs0F12bYL2YuN717PzplXvaxvFg8aHT14e7moWzkeoQGXNbZ4JOu7JmsJjWMyPH/mmGDLM3ugQMa8aIC/iM1OronLmc5qERrlQaOZ8L6ytrfqJ0Uo3N8mmqy0MinINOCT0yPjxp/CHxUxg6R+NrZApYru66UN2AsHvFtoa2TZ0=
+    secure: "GKs0F12bYL2YuN717PzplXvaxvFg8aHT14e7moWzkeoQGXNbZ4JOu7JmsJjWMyPH/mmGDLM3ugQMa8aIC/iM1OronLmc5qERrlQaOZ8L6ytrfqJ0Uo3N8mmqy0MinINOCT0yPjxp/CHxUxg6R+NrZApYru66UN2AsHvFtoa2TZ0="
   on:
     tags: true
     # all_branches is required to use tags

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,28 @@
 
 ## [Unreleased](https://github.com/arioch/puppet-redis/tree/HEAD)
 
-[Full Changelog](https://github.com/arioch/puppet-redis/compare/v3.0.0...HEAD)
+[Full Changelog](https://github.com/arioch/puppet-redis/compare/v3.1.0...HEAD)
+
+## [v3.1.0](https://github.com/arioch/puppet-redis/tree/v3.1.0) (2017-05-11)
+
+[Full Changelog](https://github.com/arioch/puppet-redis/compare/3.0.0...v3.1.0)
+
+**Implemented enhancements:**
+
+- Please cut a release [\#201](https://github.com/arioch/puppet-redis/issues/201)
 
 **Fixed bugs:**
 
 - Sort problem in v1.2.4 template [\#195](https://github.com/arioch/puppet-redis/issues/195)
 
+**Merged pull requests:**
+
+- Add an optional third parameter to redisget\(\) to specify a default value [\#209](https://github.com/arioch/puppet-redis/pull/209) ([petems](https://github.com/petems))
+- Updates docs for puppet functions [\#208](https://github.com/arioch/puppet-redis/pull/208) ([petems](https://github.com/petems))
+- Add switch to manage File\[/var/run/redis\] [\#204](https://github.com/arioch/puppet-redis/pull/204) ([petems](https://github.com/petems))
+- Ignore selinux default context for /etc/systemd/system/redis.service.d [\#202](https://github.com/arioch/puppet-redis/pull/202) ([amoralej](https://github.com/amoralej))
+- Make TravisCI push to the Forge [\#191](https://github.com/arioch/puppet-redis/pull/191) ([arioch](https://github.com/arioch))
+
 ## [v3.0.0](https://github.com/arioch/puppet-redis/tree/v3.0.0) (2017-05-11)
 [Full Changelog](https://github.com/arioch/puppet-redis/compare/1.2.4...v3.0.0)
 
@@ -87,7 +103,7 @@
 
 - For folks that do not use redis to cache to disk [\#144](https://github.com/arioch/puppet-redis/pull/144) ([petems](https://github.com/petems))
 - Revert "Changes templates to use scope" [\#143](https://github.com/arioch/puppet-redis/pull/143) ([petems](https://github.com/petems))
-- Update sentinel.pp [\#141](https://github.com/arioch/puppet-redis/pull/141) ([denis-sorokin](https://github.com/denis-sorokin))
+- Update sentinel.pp [\#141](https://github.com/arioch/puppet-redis/pull/141) ([xprntl](https://github.com/xprntl))
 - Manage workdir and permissions [\#138](https://github.com/arioch/puppet-redis/pull/138) ([petems](https://github.com/petems))
 - Adds minimum versions parameters [\#137](https://github.com/arioch/puppet-redis/pull/137) ([petems](https://github.com/petems))
 - Adds redis-server version fact [\#136](https://github.com/arioch/puppet-redis/pull/136) ([petems](https://github.com/petems))

diff --git a/Gemfile b/Gemfile
@@ -36,6 +36,10 @@ group :test do
   gem 'mock_redis',                                                 :require => false
 end
 
+group :development do
+  gem 'puppet-blacksmith'
+end
+
 group :system_tests do
   gem "beaker", '2.41.0', :require => false
   gem "beaker-rspec", '5.6.0', :require => false

diff --git a/Rakefile b/Rakefile
@@ -2,6 +2,13 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
 
+# These two gems aren't always present, for instance
+# on Travis with --without development
+begin
+  require 'puppet_blacksmith/rake_tasks'
+rescue LoadError
+end
+
 PuppetLint.configuration.fail_on_warnings
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "arioch-redis",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Tom De Vylder",
   "summary": "Redis module",
   "license": "Apache-2.0",