Merge pull request #28 from cdwilhelm/curt-dev

Use new versions of rightline_tag and machine_tag
rightscale-cookbooks · Feb 11, 2016 · 583a001 · 583a001
2 parents afa2497 + b2ab9c0
commit 583a001
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Berksfile b/Berksfile
@@ -3,9 +3,11 @@ site :opscode
 metadata
 
 cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu'
+cookbook 'rightscale_tag', github: 'rightscale-cookbooks/rightscale_tag'
+cookbook 'machine_tag', github: 'rightscale-cookbooks/machine_tag'
 
 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'

diff --git a/metadata.rb b/metadata.rb
@@ -4,15 +4,15 @@
 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.2.0'
 
 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.3'
+depends 'rightscale_tag', '~> 1.1.0'
 depends "swap", "~> 0.3.5"
 depends "rsyslog", "~> 1.12.2"
 depends "collectd", "~> 1.1.0"