Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge "[service-ng] Merge varz from base gem"

  • Loading branch information...
commit acd5a76b7cf40fd2af5bec1b242841829ebfded6 2 parents 39aa5f6 + fe7b499
Felix Hu felixhoo authored Gerrit Code Review committed
Showing with 102 additions and 99 deletions.
  1. +1 −1  atmos/Gemfile
  2. +3 −3 atmos/Gemfile.lock
  3. BIN  atmos/vendor/cache/cf-uaa-lib-1.3.1.gem
  4. BIN  atmos/vendor/cache/cf-uaa-lib-1.3.3.gem
  5. +1 −1  couchdb/Gemfile
  6. +3 −3 couchdb/Gemfile.lock
  7. BIN  couchdb/vendor/cache/cf-uaa-lib-1.3.1.gem
  8. BIN  couchdb/vendor/cache/cf-uaa-lib-1.3.3.gem
  9. +1 −1  echo/Gemfile
  10. +3 −3 echo/Gemfile.lock
  11. BIN  echo/vendor/cache/cf-uaa-lib-1.3.1.gem
  12. BIN  echo/vendor/cache/cf-uaa-lib-1.3.3.gem
  13. +1 −1  elasticsearch/Gemfile
  14. +3 −3 elasticsearch/Gemfile.lock
  15. BIN  elasticsearch/vendor/cache/cf-uaa-lib-1.3.1.gem
  16. BIN  elasticsearch/vendor/cache/cf-uaa-lib-1.3.3.gem
  17. +1 −1  filesystem/Gemfile
  18. +3 −3 filesystem/Gemfile.lock
  19. BIN  filesystem/vendor/cache/cf-uaa-lib-1.3.1.gem
  20. BIN  filesystem/vendor/cache/cf-uaa-lib-1.3.3.gem
  21. +1 −1  marketplace/Gemfile
  22. +3 −3 marketplace/Gemfile.lock
  23. BIN  marketplace/vendor/cache/cf-uaa-lib-1.3.1.gem
  24. BIN  marketplace/vendor/cache/cf-uaa-lib-1.3.3.gem
  25. +1 −1  memcached/Gemfile
  26. +3 −3 memcached/Gemfile.lock
  27. BIN  memcached/vendor/cache/cf-uaa-lib-1.3.1.gem
  28. BIN  memcached/vendor/cache/cf-uaa-lib-1.3.3.gem
  29. +1 −1  neo4j/Gemfile
  30. +3 −3 neo4j/Gemfile.lock
  31. BIN  neo4j/vendor/cache/cf-uaa-lib-1.3.1.gem
  32. BIN  neo4j/vendor/cache/cf-uaa-lib-1.3.3.gem
  33. +1 −1  ng/memcached/Gemfile
  34. +3 −3 ng/memcached/Gemfile.lock
  35. +1 −1  ng/memcached/lib/memcached_service/memcached_node.rb
  36. BIN  ng/memcached/vendor/cache/cf-uaa-lib-1.3.1.gem
  37. BIN  ng/memcached/vendor/cache/cf-uaa-lib-1.3.3.gem
  38. +1 −1  ng/mongodb/Gemfile
  39. +3 −3 ng/mongodb/Gemfile.lock
  40. +3 −2 ng/mongodb/lib/mongodb_service/mongodb_node.rb
  41. BIN  ng/mongodb/vendor/cache/cf-uaa-lib-1.3.1.gem
  42. BIN  ng/mongodb/vendor/cache/cf-uaa-lib-1.3.3.gem
  43. +1 −1  ng/mysql/Gemfile
  44. +3 −3 ng/mysql/Gemfile.lock
  45. +10 −11 ng/mysql/lib/mysql_service/node.rb
  46. BIN  ng/mysql/vendor/cache/cf-uaa-lib-1.3.1.gem
  47. BIN  ng/mysql/vendor/cache/cf-uaa-lib-1.3.3.gem
  48. +1 −1  ng/postgresql/Gemfile
  49. +3 −3 ng/postgresql/Gemfile.lock
  50. +3 −3 ng/postgresql/lib/postgresql_service/node.rb
  51. +1 −1  ng/postgresql/lib/postgresql_service/with_warden.rb
  52. +2 −2 ng/postgresql/lib/postgresql_service/without_warden.rb
  53. BIN  ng/postgresql/vendor/cache/cf-uaa-lib-1.3.1.gem
  54. BIN  ng/postgresql/vendor/cache/cf-uaa-lib-1.3.3.gem
  55. +1 −1  ng/rabbit/Gemfile
  56. +3 −3 ng/rabbit/Gemfile.lock
  57. +1 −1  ng/rabbit/lib/rabbit_service/rabbit_node.rb
  58. BIN  ng/rabbit/vendor/cache/cf-uaa-lib-1.3.1.gem
  59. BIN  ng/rabbit/vendor/cache/cf-uaa-lib-1.3.3.gem
  60. +1 −1  ng/redis/Gemfile
  61. +3 −3 ng/redis/Gemfile.lock
  62. +1 −1  ng/redis/lib/redis_service/redis_node.rb
  63. BIN  ng/redis/vendor/cache/cf-uaa-lib-1.3.1.gem
  64. BIN  ng/redis/vendor/cache/cf-uaa-lib-1.3.3.gem
  65. +1 −1  ng/vblob/Gemfile
  66. +3 −3 ng/vblob/Gemfile.lock
  67. BIN  ng/vblob/vendor/cache/cf-uaa-lib-1.3.1.gem
  68. BIN  ng/vblob/vendor/cache/cf-uaa-lib-1.3.3.gem
  69. +3 −3 oauth2/Gemfile
  70. +13 −10 oauth2/Gemfile.lock
  71. +1 −1  tools/backup/manager/Gemfile
  72. +3 −3 tools/backup/manager/Gemfile.lock
  73. BIN  tools/backup/manager/vendor/cache/cf-uaa-lib-1.3.1.gem
  74. BIN  tools/backup/manager/vendor/cache/cf-uaa-lib-1.3.3.gem
2  atmos/Gemfile
View
@@ -13,7 +13,7 @@ gem "xml-simple"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 atmos/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
BIN  atmos/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  atmos/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  couchdb/Gemfile
View
@@ -14,7 +14,7 @@ gem "couchrest"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 couchdb/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
BIN  couchdb/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  couchdb/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  echo/Gemfile
View
@@ -13,7 +13,7 @@ gem "thin"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 echo/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
BIN  echo/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  echo/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  elasticsearch/Gemfile
View
@@ -12,7 +12,7 @@ gem "rest-client"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 elasticsearch/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
BIN  elasticsearch/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  elasticsearch/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  filesystem/Gemfile
View
@@ -12,7 +12,7 @@ gem "thin"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 filesystem/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
BIN  filesystem/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  filesystem/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  marketplace/Gemfile
View
@@ -11,7 +11,7 @@ gem "cf-uaa-client"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 marketplace/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -81,7 +81,7 @@ GEM
launchy
rest-client
yajl-ruby
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.1)
builder (>= 2.1.2)
BIN  marketplace/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  marketplace/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  memcached/Gemfile
View
@@ -12,7 +12,7 @@ gem "dalli"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 memcached/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
BIN  memcached/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  memcached/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  neo4j/Gemfile
View
@@ -14,7 +14,7 @@ gem "thin"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 neo4j/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
BIN  neo4j/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  neo4j/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  ng/memcached/Gemfile
View
@@ -12,7 +12,7 @@ gem "dalli"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 ng/memcached/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
2  ng/memcached/lib/memcached_service/memcached_node.rb
View
@@ -221,7 +221,7 @@ def get_credentials(p_service)
end
def varz_details
- varz = {}
+ varz = super
varz[:provisioned_instances_num] = 0
varz[:max_instances_num] = @options[:capacity] / capacity_unit
BIN  ng/memcached/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  ng/memcached/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  ng/mongodb/Gemfile
View
@@ -16,7 +16,7 @@ gem "posix-spawn"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 ng/mongodb/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -77,7 +77,7 @@ GEM
bson_ext (1.5.2)
bson (= 1.5.2)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.9)
builder (>= 2.1.2)
5 ng/mongodb/lib/mongodb_service/mongodb_node.rb
View
@@ -290,6 +290,7 @@ def update_instance(service_credential, binding_credentials)
end
def varz_details
+ varz = super
# Do disk summary
du_hash = {}
du_all_out = `cd #{@base_dir}; du -sk * 2> /dev/null`
@@ -320,13 +321,13 @@ def varz_details
@logger.error("Error get instance list: #{e}")
end
- {
+ varz.merge!({
:running_services => stats,
:disk => du_hash,
:max_capacity => @max_capacity,
:available_capacity => @capacity,
:instances => provisioned_instances
- }
+ })
end
end
BIN  ng/mongodb/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  ng/mongodb/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  ng/mysql/Gemfile
View
@@ -17,7 +17,7 @@ gem "curb"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 ng/mysql/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
21 ng/mysql/lib/mysql_service/node.rb
View
@@ -43,17 +43,12 @@ def initialize(options)
@use_warden = false unless @use_warden === true
if @use_warden
require "mysql_service/with_warden"
- class << self
- include VCAP::Services::Mysql::WithWarden
- include VCAP::Services::Base::Utils
- include VCAP::Services::Base::Warden::NodeUtils
- def service_instances
- mysqlProvisionedService.all
- end
- end
+ self.class.send(:include, VCAP::Services::Mysql::WithWarden)
+ self.class.send(:include, VCAP::Services::Base::Utils)
+ self.class.send(:include, VCAP::Services::Base::Warden::NodeUtils)
else
require "mysql_service/without_warden"
- class << self; include VCAP::Services::Mysql::WithoutWarden; end
+ self.class.send(:include, VCAP::Services::Mysql::WithoutWarden)
end
init_internal(options)
@@ -91,6 +86,10 @@ class << self; include VCAP::Services::Mysql::WithoutWarden; end
mysqlProvisionedService.init(options)
end
+ def service_instances
+ mysqlProvisionedService.all
+ end
+
def pre_send_announcement
FileUtils.mkdir_p(@base_dir) if @base_dir
@@ -622,8 +621,8 @@ def exe_cmd(cmd, stdin=nil)
return [o, e, s]
end
- def varz_details()
- varz = {}
+ def varz_details
+ varz = super
# how many queries served since startup
varz[:queries_since_startup] = get_queries_status
# queries per second
BIN  ng/mysql/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  ng/mysql/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  ng/postgresql/Gemfile
View
@@ -16,7 +16,7 @@ gem "fadvise"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 ng/postgresql/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
6 ng/postgresql/lib/postgresql_service/node.rb
View
@@ -61,13 +61,13 @@ def initialize(options)
@use_warden = @options[:use_warden] || false
if @use_warden
require "postgresql_service/with_warden"
- extend VCAP::Services::Postgresql::WithWarden
+ self.class.send(:include, VCAP::Services::Postgresql::WithWarden)
@service_start_timeout = options[:service_start_timeout] || 3
init_ports(options[:port_range])
pgProvisionedService.init(options)
else
require "postgresql_service/without_warden"
- extend VCAP::Services::Postgresql::WithoutWarden
+ self.class.send(:include, VCAP::Services::Postgresql::WithoutWarden)
end
end
@@ -667,7 +667,7 @@ def update_instance(prov_cred, binding_creds_hash)
end
def varz_details()
- varz = {}
+ varz = super
# db stat
varz[:db_stat] = get_db_stat
varz[:max_capacity] = @max_capacity
2  ng/postgresql/lib/postgresql_service/with_warden.rb
View
@@ -15,7 +15,7 @@ module VCAP::Services::Postgresql::WithWarden
include VCAP::Services::Base::Warden::NodeUtils
def self.included(base)
- unless base.is_a? VCAP::Services::Postgresql::Node
+ unless base == VCAP::Services::Postgresql::Node
raise "WithWarden should be included in a Node instance"
end
end
4 ng/postgresql/lib/postgresql_service/without_warden.rb
View
@@ -14,7 +14,7 @@ module VCAP::Services::Postgresql::WithoutWarden
include VCAP::Services::Postgresql::Util
def self.included(base)
- unless base.is_a? VCAP::Services::Postgresql::Node
+ unless base == VCAP::Services::Postgresql::Node
raise "WithoutWarden should be included in a Node instance"
end
end
@@ -400,4 +400,4 @@ def set_inst_port(instance, credential)
true
end
- end
+end
BIN  ng/postgresql/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  ng/postgresql/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  ng/rabbit/Gemfile
View
@@ -16,7 +16,7 @@ gem "rest-client"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 ng/rabbit/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -76,7 +76,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
2  ng/rabbit/lib/rabbit_service/rabbit_node.rb
View
@@ -171,7 +171,7 @@ def restore(instance_id, backup_dir)
end
def varz_details
- varz = {}
+ varz = super
varz[:provisioned_instances] = []
varz[:provisioned_instances_num] = 0
varz[:max_capacity] = @max_capacity
BIN  ng/rabbit/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  ng/rabbit/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  ng/redis/Gemfile
View
@@ -16,7 +16,7 @@ gem "curb"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 ng/redis/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
2  ng/redis/lib/redis_service/redis_node.rb
View
@@ -137,7 +137,7 @@ def unbind(credentials)
end
def varz_details
- varz = {}
+ varz = super
varz[:max_capacity] = @max_capacity
varz[:available_capacity] = @capacity
varz[:provisioned_instances] = []
BIN  ng/redis/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  ng/redis/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
2  ng/vblob/Gemfile
View
@@ -16,7 +16,7 @@ gem "yajl-ruby"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 ng/vblob/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.9)
builder (>= 2.1.2)
BIN  ng/vblob/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  ng/vblob/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
6 oauth2/Gemfile
View
@@ -3,9 +3,9 @@ source :rubygems
gem 'eventmachine', :git => 'git://github.com/cloudfoundry/eventmachine.git', :branch => 'release-0.12.11-cf'
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'c1a412ff'
-gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
-gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
+gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
+gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'cf-uaa-client', :git => 'git://github.com/cloudfoundry/uaa.git', :ref => 'master'
group :test do
23 oauth2/Gemfile.lock
View
@@ -45,10 +45,11 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: c1a412ffe9854da6d5564d880a6354b37768a541
- ref: c1a412ff
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
- vcap_services_base (0.1.16)
+ vcap_services_base (0.1.17)
+ cf-uaa-lib
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
@@ -66,17 +67,17 @@ GIT
uuidtools (~> 2.1.2)
vcap_common (>= 1.0.8)
vcap_logging (>= 1.0.2)
- warden-client (~> 0.0.6)
- warden-protocol (~> 0.0.5)
+ warden-client (~> 0.0.7)
+ warden-protocol (~> 0.0.9)
GIT
remote: git://github.com/cloudfoundry/warden.git
- revision: 21f9a32ab501a6485c9a4e7aff4f9b6f40e31e3c
- ref: 21f9a32ab50
+ revision: fe6cb5130388fd3117de9b16e830d45844cf05c9
+ ref: fe6cb51
specs:
- warden-client (0.0.6)
+ warden-client (0.0.7)
warden-protocol
- warden-protocol (0.0.5)
+ warden-protocol (0.0.9)
beefcake
GEM
@@ -86,6 +87,8 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.1.3)
+ cf-uaa-lib (1.3.3)
+ multi_json
ci_reporter (1.7.2)
builder (>= 2.1.2)
curb (0.7.18)
@@ -204,7 +207,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.3.3)
- uuid (2.3.5)
+ uuid (2.3.6)
macaddr (~> 1.0)
uuidtools (2.1.3)
vegas (0.1.11)
2  tools/backup/manager/Gemfile
View
@@ -8,7 +8,7 @@ gem 'nats'
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
6 tools/backup/manager/Gemfile.lock
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
BIN  tools/backup/manager/vendor/cache/cf-uaa-lib-1.3.1.gem
View
Binary file not shown
BIN  tools/backup/manager/vendor/cache/cf-uaa-lib-1.3.3.gem
View
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.