Merge 9c1248c into b753da3

dev-sec · Oct 17, 2015 · d3a1625 · d3a1625
2 parents b753da3 + 9c1248c
commit d3a1625
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,9 @@
 ---
 rvm:
-- 1.9.3
 - 2.0.0
 - 2.1.3
 gemfile:
 - Gemfile
 - gemfile.chef-11
 language: ruby
 bundler_args: "--without development integration openstack"
-matrix:
-  exclude:
-  - rvm: 1.9.3
-    gemfile: Gemfile
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'berkshelf',  '~> 3.0'
+gem 'berkshelf',  '~> 4.0'
 gem 'chef',       '>= 12.0'
 
 group :test do

diff --git a/gemfile.chef-11 b/gemfile.chef-11
@@ -2,8 +2,8 @@
 
 source 'https://rubygems.org'
 
-gem 'berkshelf',  '~> 3.0'
-gem 'chef',       '~> 11.16'
+gem 'berkshelf',  '~> 4.0'
+gem 'chef',       '~> 11.18'
 
 group :test do
   gem 'rake'