Skip to content

Commit 62bcdcc

Browse files
committed
Merge pull request #103 from basho/hc-yum-version-constraint
Add version constraint on yum cookbook so that it stays under v3.0.
2 parents dddf04f + fc4136b commit 62bcdcc

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

Berksfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata
44

55
group :integration do
66
cookbook "apt"
7-
cookbook "yum", ">= 2.2.4"
7+
cookbook "yum", "< 3.0"
88
cookbook "minitest-handler"
99
end

Gemfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
source "https://rubygems.org"
1+
source "https://rubygems.org"
22

3-
gem "rake"
4-
gem "foodcritic"
3+
gem "berkshelf", "~> 2.0"
4+
gem "foodcritic", "~> 3.0"
5+
6+
group :integration do
7+
gem "test-kitchen", "~> 1.0"
8+
gem "kitchen-vagrant", "~> 0.11"
9+
end

metadata.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
recipe "riak", "Installs Riak from a package"
2828
recipe "riak::source", "Installs Erlang and Riak from source"
2929

30-
%w{apt yum build-essential erlang git sysctl ulimit}.each do |d|
30+
%w{apt build-essential erlang git sysctl ulimit}.each do |d|
3131
depends d
3232
end
3333

34+
depends "yum", "< 3.0"
35+
3436
%w{ubuntu debian centos redhat fedora}.each do |os|
3537
supports os
3638
end

0 commit comments

Comments
 (0)