Merge pull request #29 from rightscale-cookbooks/st_14_14_acu183543_b…

…ump_version

Preparation for patch version bump

.travis.yml

@@ -5,10 +5,5 @@ rvm:
 before_script: bundle exec berks install
 script: bundle exec strainer test --except kitchen
 notifications:
-  irc:
-    channels:
-    - chat.freenode.net#rightscale
-    use_notice: true
-    skip_join: true
   slack:
     secure: TIZFCcm+FcFBB6IoEBv2174qwXe1SxVsGpkMe6eZjccVwmgRt2ik8To03Orpjy/2VOztuqJdDqmHOucbmoL/67W2rnAHjVk85dlGGv60Xqf4F+oSfmc0igESocfZLbv0yhD2SBDIt/RGRqQyGEW1YmNsk7QiFx0HqnXpn0aycaA=

CHANGELOG.md

@@ -3,6 +3,13 @@ rs-mysql Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the rs-mysql cookbook.
 
+v1.1.2
+------
+
+- Add kitchen testing for RHEL 6.5 and Ubuntu 14.04.
+- Update versions of dependent cookbooks.
+- Update testing code to abide by Serverspec v2.
+
 v1.1.1
 ------
 

metadata.rb

@@ -4,17 +4,17 @@
 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.1'
+version          '1.1.2'
 
 depends 'chef_handler', '~> 1.1.6'
-depends 'marker', '~> 1.0.0'
+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.2'
 depends 'filesystem', '~> 0.9.0'
 depends 'lvm', '~> 1.1.0'
-depends 'rightscale_volume', '~> 1.2.3'
+depends 'rightscale_volume', '~> 1.2.4'
 depends 'rightscale_backup', '~> 1.1.5'
 depends 'dns', '~> 0.1.3'
 depends 'git', '~> 4.0.2'