Permalink
Browse files

cleanup version related configurations

Change-Id: I9c0f1998bc2806af020136757e30b35049c6143f
  • Loading branch information...
1 parent f2ed7dd commit 42bbb3ce2cfa1acd0b8880a97a5d63ccfb42cf01 @andl andl committed Jul 24, 2012
Showing with 2 additions and 5 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 lib/base/asynchronous_service_gateway.rb
  3. +0 −3 lib/base/gateway.rb
  4. +0 −1 lib/base/provisioner.rb
View
@@ -13,3 +13,4 @@ ci-working-dir
.rvmrc
nats-server.pid
pkg
+tags
@@ -57,7 +57,7 @@ def setup(opts)
@double_check_orphan_interval = opts[:double_check_orphan_interval] || 300
@handle_fetched = false
@fetching_handles = false
- @version_aliases = opts[:version_aliases]
+ @version_aliases = @service[:version_aliases] || {}
@svc_json = {
:label => @service[:label],
:url => @service[:url],
View
@@ -105,7 +105,6 @@ def start
:plan_management => @config[:plan_management],
:service => @config[:service],
:download_url_template => @config[:download_url_template],
- :version_aliases => @config[:version_aliases]
)
sg = async_gateway_class.new(
:proxy => @config[:proxy],
@@ -118,8 +117,6 @@ def start
:check_orphan_interval => @config[:check_orphan_interval],
:double_check_orphan_interval => @config[:double_check_orphan_interval],
:api_extensions => @config[:api_extensions],
- :supported_versions => @config[:supported_versions],
- :version_aliases => @config[:version_aliases]
)
Thin::Server.start(@config[:host], @config[:port], sg)
end
View
@@ -32,7 +32,6 @@ def initialize(options)
@instance_handles_CO = {}
@binding_handles_CO = {}
@plan_mgmt = options[:plan_management] && options[:plan_management][:plans] || {}
- @version_aliases = options[:version_aliases]
init_service_extensions

0 comments on commit 42bbb3c

Please sign in to comment.