Mod: merge conflict resolve
Showing
- .gitignore 8 additions, 2 deletions.gitignore
- CHANGE.md 26 additions, 0 deletionsCHANGE.md
- LICENSE 0 additions, 1 deletionLICENSE
- cluster/cluster_impl/failback_cluster_invoker.go 8 additions, 4 deletionscluster/cluster_impl/failback_cluster_invoker.go
- cluster/cluster_impl/failover_cluster_invoker.go 14 additions, 4 deletionscluster/cluster_impl/failover_cluster_invoker.go
- cluster/cluster_impl/failover_cluster_test.go 4 additions, 4 deletionscluster/cluster_impl/failover_cluster_test.go
- cluster/loadbalance/least_active.go 0 additions, 1 deletioncluster/loadbalance/least_active.go
- cluster/loadbalance/round_robin_test.go 17 additions, 0 deletionscluster/loadbalance/round_robin_test.go
- common/constant/default.go 9 additions, 7 deletionscommon/constant/default.go
- common/extension/router_factory.go 17 additions, 0 deletionscommon/extension/router_factory.go
- common/proxy/proxy_factory/default.go 92 additions, 2 deletionscommon/proxy/proxy_factory/default.go
- common/url.go 4 additions, 0 deletionscommon/url.go
- config/base_config_test.go 10 additions, 10 deletionsconfig/base_config_test.go
- config/consumer_config.go 1 addition, 0 deletionsconfig/consumer_config.go
- config/method_config.go 1 addition, 1 deletionconfig/method_config.go
- config/provider_config.go 1 addition, 0 deletionsconfig/provider_config.go
- config/reference_config.go 3 additions, 3 deletionsconfig/reference_config.go
- config/reference_config_test.go 4 additions, 5 deletionsconfig/reference_config_test.go
- config/service_config.go 3 additions, 3 deletionsconfig/service_config.go
- config/service_config_test.go 3 additions, 3 deletionsconfig/service_config_test.go
Please register or sign in to comment