From 65cc222b34bff78bc1c4928a157acd4cc1cdd527 Mon Sep 17 00:00:00 2001
From: Cara McCormack <caramcc@ccs.neu.edu>
Date: Thu, 15 Sep 2016 12:29:11 -0400
Subject: [PATCH] Release 2.5.0

- Update changelog.md to reflect changes since previous release.
- Update version number in metadata and README
- Minor bugfix - added missing `end` in .kitchen.yml
---
 .kitchen.yml |  1 +
 README.md    |  2 +-
 changelog.md | 15 +++++++++++++++
 metadata.rb  |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index a6608164..9b88c9de 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -44,6 +44,7 @@ platforms:
     run_list:
       - recipe[yum-epel::default]
       - recipe[yum-remi::default]
+<% end %>
 
 suites:
   - name: default
diff --git a/README.md b/README.md
index 658f5268..a0333e1f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 **Please read the changelog when upgrading from the 1.x series to the 2.x series**
 
-![cookbook version](http://img.shields.io/badge/cookbook%20version-2.4.2-blue.svg)
+![cookbook version](http://img.shields.io/badge/cookbook%20version-2.5.0-blue.svg)
 Description
 ===========
 
diff --git a/changelog.md b/changelog.md
index 02b9b203..816df447 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,21 @@
 redisio CHANGE LOG
 ===
 
+2.5.0 -
+---
+  - Ubuntu 14 added as tested platform. (#264)
+  - FreeBSD-10.3 support added. (#279)
+    - installation from source is not supported
+    - setting ulimits is not supported
+  - Encrypted databag support added. (#228)
+  - Systemd nofile limit fixed. (#228)
+  - Announce-ip and announce-port directives for sentinel added. (#228)
+  - Disabling safe_install in the install recipe allowed. (#284)
+  - Protected-mode added as optional (#275, #289)
+  - Fixes nil exception when installing sentinel on non-debian and non-rhel platforms (#288)
+
+
+
 2.4.2 -
 ---
   - Created a 2.4.1 tag but somehow the metadata file wasn't updated.  Instead
diff --git a/metadata.rb b/metadata.rb
index abb0cfb7..ecdc7b74 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures redis'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '2.4.2'
+version          '2.5.0'
 
 %w(
   amazon