Merge branch 'master' into pooler_193

This commit is contained in:
John O'Connor 2020-11-10 15:17:06 +00:00 committed by GitHub
commit 41aeda2d2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -30,7 +30,7 @@ Gem::Specification.new do |s|
s.add_dependency 'opentelemetry-sdk', '= 0.8.0'
s.add_dependency 'pickup', '~> 0.0.11'
s.add_dependency 'prometheus-client', '~> 2.0'
s.add_dependency 'puma', '~> 4.3'
s.add_dependency 'puma', '~> 5.0', '>= 5.0.4'
s.add_dependency 'rack', '~> 2.2'
s.add_dependency 'rake', '~> 13.0'
s.add_dependency 'rbvmomi', '>= 2.1', '< 4.0'