Skip to content

Commit 313c14d

Browse files
committed
Bump the Berkshelf gem to prevent dependency conflict.
1 parent c2f6802 commit 313c14d

2 files changed

Lines changed: 19 additions & 24 deletions

File tree

Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'berkshelf', '3.1.3'
3+
gem 'berkshelf', '3.2.3'
44
gem 'knife-spec'
55
gem 'chef', '11.16.4'
6-
gem 'solve', '1.2.0'
7-
gem 'nokogiri', '1.6.1'
86
gem 'serverspec', '1.11.0'

Gemfile.lock

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.3.7)
5-
berkshelf (3.1.3)
4+
addressable (2.3.8)
5+
berkshelf (3.2.3)
66
addressable (~> 2.3.4)
77
berkshelf-api-client (~> 1.2)
88
buff-config (~> 1.0)
99
buff-extensions (~> 1.0)
1010
buff-shell_out (~> 0.1)
11-
celluloid (~> 0.16.0.pre)
12-
celluloid-io (~> 0.16.0.pre)
11+
celluloid (~> 0.16.0)
12+
celluloid-io (~> 0.16.1)
13+
cleanroom (~> 1.0)
1314
faraday (~> 0.9.0)
1415
minitar (~> 0.5.4)
1516
octokit (~> 3.0)
16-
retryable (~> 1.3.3)
17+
retryable (~> 2.0)
1718
ridley (~> 4.0)
1819
solve (~> 1.1)
19-
thor (~> 0.18)
20+
thor (~> 0.19)
2021
berkshelf-api-client (1.2.1)
2122
faraday (~> 0.9.0)
2223
buff-config (1.0.1)
@@ -55,6 +56,7 @@ GEM
5556
hashie (~> 2.0)
5657
mixlib-log (~> 1.3)
5758
rack
59+
cleanroom (1.0.0)
5860
coderay (1.1.0)
5961
dep-selector-libgecode (1.0.2)
6062
dep_selector (1.0.3)
@@ -64,12 +66,12 @@ GEM
6466
erubis (2.7.0)
6567
faraday (0.9.1)
6668
multipart-post (>= 1.2, < 3)
67-
ffi (1.9.6)
68-
ffi-yajl (1.3.1)
69+
ffi (1.9.8)
70+
ffi-yajl (1.4.0)
6971
ffi (~> 1.5)
7072
libyajl2 (~> 1.2)
7173
hashie (2.1.2)
72-
highline (1.6.21)
74+
highline (1.7.1)
7375
hitimes (1.2.2)
7476
ipaddress (0.8.0)
7577
json (1.8.2)
@@ -78,7 +80,6 @@ GEM
7880
libyajl2 (1.2.0)
7981
method_source (0.8.2)
8082
mime-types (1.25.1)
81-
mini_portile (0.5.3)
8283
minitar (0.5.4)
8384
mixlib-authentication (1.3.0)
8485
mixlib-log
@@ -95,9 +96,7 @@ GEM
9596
net-ssh (>= 2.6.5)
9697
net-ssh-gateway (>= 1.2.0)
9798
nio4r (1.1.0)
98-
nokogiri (1.6.1)
99-
mini_portile (~> 0.5.0)
100-
octokit (3.7.0)
99+
octokit (3.8.0)
101100
sawyer (~> 0.6.0, >= 0.5.3)
102101
ohai (7.4.1)
103102
ffi (~> 1.9)
@@ -118,8 +117,8 @@ GEM
118117
rack (1.6.0)
119118
rest-client (1.6.7)
120119
mime-types (>= 1.16)
121-
retryable (1.3.6)
122-
ridley (4.1.1)
120+
retryable (2.0.1)
121+
ridley (4.1.2)
123122
addressable
124123
buff-config (~> 1.0)
125124
buff-extensions (~> 1.0)
@@ -133,7 +132,7 @@ GEM
133132
json (>= 1.7.7)
134133
mixlib-authentication (>= 1.3.0)
135134
net-http-persistent (>= 2.8)
136-
retryable
135+
retryable (>= 2.0.0)
137136
semverse (~> 1.1)
138137
varia_model (~> 0.4)
139138
rspec (2.99.0)
@@ -158,11 +157,11 @@ GEM
158157
rspec-its
159158
specinfra (~> 1.22)
160159
slop (3.6.0)
161-
solve (1.2.0)
160+
solve (1.2.1)
162161
dep_selector (~> 1.0)
163162
semverse (~> 1.1)
164163
specinfra (1.27.5)
165-
systemu (2.6.4)
164+
systemu (2.6.5)
166165
thor (0.19.1)
167166
timers (4.0.1)
168167
hitimes
@@ -175,9 +174,7 @@ PLATFORMS
175174
ruby
176175

177176
DEPENDENCIES
178-
berkshelf (= 3.1.3)
177+
berkshelf (= 3.2.3)
179178
chef (= 11.16.4)
180179
knife-spec
181-
nokogiri (= 1.6.1)
182180
serverspec (= 1.11.0)
183-
solve (= 1.2.0)

0 commit comments

Comments
 (0)