Skip to content

Commit

Permalink
Merge branch 'master' into release/v2.2.0-alpha.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jakolehm committed Jan 11, 2019
2 parents ec72180 + 92f369a commit a2713fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PATH
ed25519 (= 1.2.4)
excon (~> 0.62.0)
fugit (~> 1.1.2)
k8s-client (~> 0.8.0)
k8s-client (~> 0.8.1)
net-ssh (= 5.1.0)
net-ssh-gateway (= 2.0.0)
pastel
Expand Down Expand Up @@ -74,7 +74,7 @@ GEM
jsonpath (0.9.9)
multi_json
to_regexp (~> 0.2.1)
k8s-client (0.8.0)
k8s-client (0.8.1)
dry-struct (~> 0.5.0)
excon (~> 0.62.0)
hashdiff (~> 0.3.7)
Expand Down Expand Up @@ -141,7 +141,7 @@ GEM
unicode-display_width (1.4.0)
wisper (2.0.0)
yajl-ruby (1.4.1)
yaml-safe_load_stream (0.1.0)
yaml-safe_load_stream (0.1.1)

PLATFORMS
ruby
Expand Down
2 changes: 1 addition & 1 deletion pharos-cluster.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency "fugit", "~> 1.1.2"
spec.add_runtime_dependency "rouge", "~> 3.1"
spec.add_runtime_dependency "tty-prompt", "~> 0.16"
spec.add_runtime_dependency "k8s-client", "~> 0.8.0"
spec.add_runtime_dependency "k8s-client", "~> 0.8.1"
spec.add_runtime_dependency "excon", "~> 0.62.0"

spec.add_development_dependency "bundler"
Expand Down

0 comments on commit a2713fb

Please sign in to comment.