fix dependency conflict with celluloid-io 0.16.0.pre

berkshelf · Apr 17, 2014 · 1f7ab75 · 1f7ab75
1 parent f865b30
commit 1f7ab75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,10 +13,11 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf-api (1.2.1)
+    berkshelf-api (1.2.2)
       archive (= 0.0.6)
       buff-config (~> 0.1)
       celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
       faraday (~> 0.9.0)
       grape (~> 0.6)
       grape-msgpack (~> 0.1)
@@ -216,9 +217,10 @@ GEM
       retryable
       semverse (~> 1.1)
       varia_model (~> 0.3)
-    ridley-connectors (2.0.0)
+    ridley-connectors (2.0.1)
       celluloid (~> 0.16.0.pre)
       celluloid-io (~> 0.16.0.pre)
+      erubis
       net-ssh
       ridley (~> 3.0)
       winrm (~> 1.1.0)

diff --git a/berkshelf-api.gemspec b/berkshelf-api.gemspec
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ridley',         '~> 3.0'
   spec.add_dependency 'celluloid',      '~> 0.16.0.pre'
+  spec.add_dependency 'celluloid-io',   '~> 0.16.0.pre'
   spec.add_dependency 'reel',           '~> 0.5.0'
   spec.add_dependency 'grape',          '~> 0.6'
   spec.add_dependency 'grape-msgpack',  '~> 0.1'