From 8f3b41f5be166bd85640ff109fefa43f924f374b Mon Sep 17 00:00:00 2001
From: Richard Shade <rshade@rightscale.com>
Date: Tue, 10 Jan 2017 13:16:37 -0600
Subject: [PATCH] pinning nio4r (#66)

* updating nio4r, pinning cookbooks

* updating version
---
 Berksfile    | 8 ++++----
 CHANGELOG.md | 4 ++++
 Gemfile      | 1 +
 metadata.rb  | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Berksfile b/Berksfile
index 98ca37f..790abdd 100644
--- a/Berksfile
+++ b/Berksfile
@@ -8,10 +8,10 @@ cookbook 'mysql', github: 'rightscale-cookbooks-contrib/mysql', branch: 'rs-fixe
 cookbook 'dns', github: 'rightscale-cookbooks-contrib/dns', branch: 'rightscale_development_v2'
 cookbook 'database', github: 'rightscale-cookbooks-contrib/database', branch: 'rs-fixes'
 
-cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup'
-cookbook 'rightscale_volume',github: 'rightscale-cookbooks/rightscale_volume'
-cookbook 'rightscale_tag',github: 'rightscale-cookbooks/rightscale_tag'
-cookbook 'machine_tag',github: 'rightscale-cookbooks/machine_tag'
+cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup', tag: 'v1.2.1'
+cookbook 'rightscale_volume',github: 'rightscale-cookbooks/rightscale_volume', tag: 'v1.3.1'
+cookbook 'rightscale_tag',github: 'rightscale-cookbooks/rightscale_tag', tag: 'v1.2.2'
+cookbook 'machine_tag',github: 'rightscale-cookbooks/machine_tag', tag: 'v1.2.2'
 cookbook 'ephemeral_lvm',github:'rightscale-cookbooks/ephemeral_lvm', tag:'v1.0.16'
 
 group :integration do
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d91e37f..e2a4ded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ rs-mysql Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the rs-mysql cookbook.
 
+v1.2.7
+------
+- pins nio4r
+
 v1.2.6
 ------
 - fixing selinux permission error when moving directories on centos.
diff --git a/Gemfile b/Gemfile
index e571286..6801558 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ gem 'varia_model', '~> 0.4.1'
 gem 'thor-foodcritic'
 gem 'rake'
 gem 'chef', '~> 11'
+gem 'nio4r', '~> 1.2', '>= 1.2.1'
 
 group :integration do
   # Prior to 0.1.6, libyaml is vulnerable to a heap overflow exploit from malicious YAML payloads.
diff --git a/metadata.rb b/metadata.rb
index b1c1075..5351f31 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs and configures a MySQL server'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.2.6'
+version          '1.2.7'
 
 depends 'chef_handler', '~> 1.1.6'
 depends 'marker', '~> 1.0.1'