From 23055033cb12be2dd2543c86c3cbfaa9e4e84459 Mon Sep 17 00:00:00 2001
From: Curt Wilhelm <curt@rightscale.com>
Date: Wed, 10 Feb 2016 17:18:09 -0700
Subject: [PATCH] bump cookbook version and use correct version of
 rightscale_tag, rightscale_volume, rightscale_backup and update Berksfile

---
 Berksfile   | 12 ++++++------
 metadata.rb |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Berksfile b/Berksfile
index 863b729..a1cde03 100644
--- a/Berksfile
+++ b/Berksfile
@@ -5,14 +5,14 @@ metadata
 cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu'
 cookbook 'mysql', github: 'rightscale-cookbooks-contrib/mysql', branch: 'rs-fixes'
 cookbook 'dns', github: 'rightscale-cookbooks-contrib/dns', branch: 'rightscale_development_v2'
-cookbook 'build-essential', '~> 2.2.4'
+#cookbook 'build-essential', '~> 2.2.4'
 cookbook 'database', github: 'rightscale-cookbooks-contrib/database', branch: 'rs-fixes'
 
-cookbook 'rightscale_backup',github: 'cdwilhelm/rightscale_backup', branch: 'curt-dev'
-cookbook 'rightscale_volume',github: 'cdwilhelm/rightscale_volume', branch: 'curt-dev'
-cookbook 'rightscale_tag',github: 'cdwilhelm/rightscale_tag', branch: 'curt-dev'
-cookbook 'machine_tag',github: 'cdwilhelm/machine_tag', branch: 'curt-dev'
-cookbook 'ephemeral_lvm',github:'cdwilhelm/ephemeral_lvm', branch: 'curt-dev'
+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 'ephemeral_lvm',github:'rightscale-cookbooks/ephemeral_lvm'
 
 group :integration do
   cookbook 'runit', '1.6.0'
diff --git a/metadata.rb b/metadata.rb
index b277090..72508cb 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,18 +4,18 @@
 license          'Apache 2.0'
 description      'Installs and configures a MySQL server'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.9'
+version          '1.2.0'
 
 depends 'chef_handler', '~> 1.1.6'
 depends 'marker', '~> 1.0.1'
 depends 'database', '~> 1.5.2'
 depends 'mysql', '~> 4.0.18'
 depends 'collectd', '~> 1.1.0'
-depends 'rightscale_tag', '~> 1.0.6'
+depends 'rightscale_tag', '~> 1.1.0'
 depends 'filesystem', '0.10.2'
 depends 'lvm', '~> 1.3.6'
-depends 'rightscale_volume', '~> 1.2.10'
-depends 'rightscale_backup', '~> 1.1.8'
+depends 'rightscale_volume', '~> 1.3.0'
+depends 'rightscale_backup', '~> 1.2.0'
 depends 'dns', '~> 0.1.3'
 depends 'git', '~> 4.0.2'