From 626005c01c47403618ed7c370d7c0c10c316ee23 Mon Sep 17 00:00:00 2001
From: Curt Wilhelm <curt@rightscale.com>
Date: Wed, 16 Dec 2015 15:29:02 -0700
Subject: [PATCH 1/4] use updated rightscale_tag cookbook to use rl10
 machine_tags

---
 metadata.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index 0879020..58ff33f 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures rs-base'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.6'
+version          '1.1.7'
 
 supports "centos"
 supports "ubuntu"
@@ -12,7 +12,7 @@
 depends 'apt', '~> 2.5.3'
 depends "ntp", "~> 1.4.0"
 depends 'marker', '~> 1.0.1'
-depends 'rightscale_tag', '~> 1.0.3'
+depends 'rightscale_tag', '~> 1.0.7'
 depends "swap", "~> 0.3.5"
 depends "rsyslog", "~> 1.12.2"
 depends "collectd", "~> 1.1.0"

From c0ad1c91ae1c6f12955916ac49a9e50777a76d24 Mon Sep 17 00:00:00 2001
From: Curt Wilhelm <curt@rightscale.com>
Date: Thu, 14 Jan 2016 17:29:32 -0700
Subject: [PATCH 2/4] upgrade cookbooks

---
 Berksfile   | 2 ++
 metadata.rb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Berksfile b/Berksfile
index 860c359..c41dc8d 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,6 +3,8 @@ site :opscode
 metadata
 
 cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu'
+cookbook 'rightscale_tag', github: 'cdwilhelm/rightscale_tag', branch: 'curt-dev'
+cookbook 'machine_tag', github: 'cdwilhelm/machine_tag', branch: 'curt-dev'
 
 group :integration do
   cookbook 'apt', '~> 2.5.3'
diff --git a/metadata.rb b/metadata.rb
index 58ff33f..1fc1cac 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -9,10 +9,10 @@
 supports "centos"
 supports "ubuntu"
 
-depends 'apt', '~> 2.5.3'
+depends 'apt', '~> 2.9.2'
 depends "ntp", "~> 1.4.0"
 depends 'marker', '~> 1.0.1'
-depends 'rightscale_tag', '~> 1.0.7'
+depends 'rightscale_tag', '~> 1.0.6'
 depends "swap", "~> 0.3.5"
 depends "rsyslog", "~> 1.12.2"
 depends "collectd", "~> 1.1.0"

From 8f107011273b3d7abdc6edd02b5f04f685e5d150 Mon Sep 17 00:00:00 2001
From: Curt Wilhelm <curt@rightscale.com>
Date: Fri, 15 Jan 2016 13:41:07 -0700
Subject: [PATCH 3/4] upgrade apt cookbook to be same as other cookbooks

---
 Berksfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Berksfile b/Berksfile
index c41dc8d..bf0d595 100644
--- a/Berksfile
+++ b/Berksfile
@@ -7,7 +7,7 @@ cookbook 'rightscale_tag', github: 'cdwilhelm/rightscale_tag', branch: 'curt-dev
 cookbook 'machine_tag', github: 'cdwilhelm/machine_tag', branch: 'curt-dev'
 
 group :integration do
-  cookbook 'apt', '~> 2.5.3'
+  cookbook 'apt', '~> 2.9.2'
   cookbook 'yum-epel', '~> 0.4.0'
   cookbook 'fake', path: './test/cookbooks/fake'
   cookbook 'rhsm', '~> 1.0.0'

From b2ab9c05825312577572f5df2f9c480f83e22cfc Mon Sep 17 00:00:00 2001
From: Curt Wilhelm <curt@rightscale.com>
Date: Wed, 10 Feb 2016 17:16:23 -0700
Subject: [PATCH 4/4] bump cookbook version and use correct version of
 rightscale_tag and machine_tag

---
 Berksfile   | 4 ++--
 metadata.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Berksfile b/Berksfile
index bf0d595..07e0f09 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,8 +3,8 @@ site :opscode
 metadata
 
 cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu'
-cookbook 'rightscale_tag', github: 'cdwilhelm/rightscale_tag', branch: 'curt-dev'
-cookbook 'machine_tag', github: 'cdwilhelm/machine_tag', branch: 'curt-dev'
+cookbook 'rightscale_tag', github: 'rightscale-cookbooks/rightscale_tag'
+cookbook 'machine_tag', github: 'rightscale-cookbooks/machine_tag'
 
 group :integration do
   cookbook 'apt', '~> 2.9.2'
diff --git a/metadata.rb b/metadata.rb
index 1fc1cac..e24a0a7 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures rs-base'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.7'
+version          '1.2.0'
 
 supports "centos"
 supports "ubuntu"
@@ -12,7 +12,7 @@
 depends 'apt', '~> 2.9.2'
 depends "ntp", "~> 1.4.0"
 depends 'marker', '~> 1.0.1'
-depends 'rightscale_tag', '~> 1.0.6'
+depends 'rightscale_tag', '~> 1.1.0'
 depends "swap", "~> 0.3.5"
 depends "rsyslog", "~> 1.12.2"
 depends "collectd", "~> 1.1.0"