Merge develop and resolve conflict
Showing
- .travis.yml 13 additions, 4 deletions.travis.yml
- cluster/cluster_impl/available_cluster_invoker_test.go 3 additions, 3 deletionscluster/cluster_impl/available_cluster_invoker_test.go
- cluster/cluster_impl/base_cluster_invoker.go 0 additions, 1 deletioncluster/cluster_impl/base_cluster_invoker.go
- cluster/cluster_impl/failover_cluster_test.go 2 additions, 2 deletionscluster/cluster_impl/failover_cluster_test.go
- cluster/directory/base_directory.go 1 addition, 1 deletioncluster/directory/base_directory.go
- cluster/directory/base_directory_test.go 2 additions, 3 deletionscluster/directory/base_directory_test.go
- cluster/directory/static_directory.go 1 addition, 1 deletioncluster/directory/static_directory.go
- common/url.go 9 additions, 14 deletionscommon/url.go
- config/base_config_test.go 8 additions, 7 deletionsconfig/base_config_test.go
- config/consumer_config.go 1 addition, 2 deletionsconfig/consumer_config.go
- config/service_config.go 3 additions, 3 deletionsconfig/service_config.go
- filter/filter_impl/hystrix_filter.go 1 addition, 1 deletionfilter/filter_impl/hystrix_filter.go
- filter/filter_impl/token_filter_test.go 6 additions, 6 deletionsfilter/filter_impl/token_filter_test.go
- go.mod 1 addition, 0 deletionsgo.mod
- go.sum 4 additions, 0 deletionsgo.sum
- integrate_test.sh 66 additions, 0 deletionsintegrate_test.sh
- protocol/dubbo/listener.go 2 additions, 2 deletionsprotocol/dubbo/listener.go
- protocol/dubbo/pool.go 7 additions, 6 deletionsprotocol/dubbo/pool.go
- protocol/jsonrpc/http.go 2 additions, 2 deletionsprotocol/jsonrpc/http.go
- protocol/jsonrpc/json.go 4 additions, 4 deletionsprotocol/jsonrpc/json.go
Please register or sign in to comment