Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update docker-api #149

Closed
wants to merge 2 commits into from
Closed

Update docker-api #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fabb64f
allow newer versions of docker-api
cap10morgan Nov 30, 2015
6a21bfa
update Gemfile.lock
cap10morgan Nov 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 37 additions & 30 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,53 @@ PATH
specs:
synapse (0.12.1)
aws-sdk (~> 1.39)
docker-api (~> 1.7.2)
docker-api (~> 1.7)
logging (~> 1.8)
zk (~> 1.9.4)

GEM
remote: https://rubygems.org/
specs:
addressable (2.3.6)
archive-tar-minitar (0.5.2)
aws-sdk (1.64.0)
aws-sdk-v1 (= 1.64.0)
aws-sdk-v1 (1.64.0)
addressable (2.3.8)
aws-sdk (1.66.0)
aws-sdk-v1 (= 1.66.0)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
coderay (1.0.9)
coderay (1.1.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
diff-lcs (1.2.5)
docker-api (1.7.6)
archive-tar-minitar
excon (>= 0.28)
docker-api (1.23.0)
excon (>= 0.38.0)
json
excon (0.45.4)
ffi (1.9.3-java)
ffi (1.9.10-java)
hashdiff (0.2.3)
json (1.8.3)
little-plugger (1.1.3)
json (1.8.3-java)
little-plugger (1.1.4)
logging (1.8.2)
little-plugger (>= 1.1.3)
multi_json (>= 1.8.4)
method_source (0.8.2)
mini_portile (0.6.2)
mini_portile2 (2.0.0)
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
nokogiri (1.6.7)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.7-java)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry (0.9.12.2-java)
coderay (~> 1.0.5)
method_source (~> 0.8)
pry (0.10.3-java)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
spoon (~> 0.0)
pry-nav (0.2.3)
pry (~> 0.9.10)
rake (10.1.1)
pry-nav (0.2.4)
pry (>= 0.9.10, < 0.11.0)
rake (10.4.2)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
Expand All @@ -61,16 +63,21 @@ GEM
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
safe_yaml (1.0.4)
slop (3.4.6)
slop (3.6.0)
slyphon-log4j (1.2.15)
slyphon-zookeeper_jar (3.3.5-java)
spoon (0.0.4)
ffi
webmock (1.18.0)
webmock (1.22.3)
addressable (>= 2.3.6)
crack (>= 0.3.2)
zk (1.9.5)
logging (~> 1.8.2)
hashdiff
zk (1.9.6)
zookeeper (~> 1.4.0)
zookeeper (1.4.10)
zookeeper (1.4.11)
zookeeper (1.4.11-java)
slyphon-log4j (= 1.2.15)
slyphon-zookeeper_jar (= 3.3.5)

PLATFORMS
java
Expand All @@ -85,4 +92,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.10.5
1.10.6
3 changes: 2 additions & 1 deletion synapse.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ Gem::Specification.new do |gem|
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})

gem.add_runtime_dependency "logging", "~> 1.8"
gem.add_runtime_dependency "aws-sdk", "~> 1.39"
gem.add_runtime_dependency "docker-api", "~> 1.7.2"
gem.add_runtime_dependency "docker-api", "~> 1.7"
gem.add_runtime_dependency "zk", "~> 1.9.4"

gem.add_development_dependency "rake"
Expand Down