Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 1f7ab75

Browse files
committed
fix dependency conflict with celluloid-io 0.16.0.pre
1 parent f865b30 commit 1f7ab75

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ GIT
1313
PATH
1414
remote: .
1515
specs:
16-
berkshelf-api (1.2.1)
16+
berkshelf-api (1.2.2)
1717
archive (= 0.0.6)
1818
buff-config (~> 0.1)
1919
celluloid (~> 0.16.0.pre)
20+
celluloid-io (~> 0.16.0.pre)
2021
faraday (~> 0.9.0)
2122
grape (~> 0.6)
2223
grape-msgpack (~> 0.1)
@@ -216,9 +217,10 @@ GEM
216217
retryable
217218
semverse (~> 1.1)
218219
varia_model (~> 0.3)
219-
ridley-connectors (2.0.0)
220+
ridley-connectors (2.0.1)
220221
celluloid (~> 0.16.0.pre)
221222
celluloid-io (~> 0.16.0.pre)
223+
erubis
222224
net-ssh
223225
ridley (~> 3.0)
224226
winrm (~> 1.1.0)

berkshelf-api.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
2121

2222
spec.add_dependency 'ridley', '~> 3.0'
2323
spec.add_dependency 'celluloid', '~> 0.16.0.pre'
24+
spec.add_dependency 'celluloid-io', '~> 0.16.0.pre'
2425
spec.add_dependency 'reel', '~> 0.5.0'
2526
spec.add_dependency 'grape', '~> 0.6'
2627
spec.add_dependency 'grape-msgpack', '~> 0.1'

0 commit comments

Comments
 (0)