Merge branch '1.4' into feature/merge1.4
# Conflicts: # common/constant/key.go # common/url.go # config_center/apollo/impl.go # config_center/apollo/listener.go # config_center/nacos/client.go # config_center/nacos/listener.go # go.mod # go.sum # protocol/rest/rest_invoker.go # registry/nacos/registry.go # registry/protocol/protocol.go
No related branches found
No related tags found
Showing
- config/consumer_config.go 6 additions, 3 deletionsconfig/consumer_config.go
- config_center/apollo/impl.go 14 additions, 25 deletionsconfig_center/apollo/impl.go
- config_center/apollo/impl_test.go 5 additions, 20 deletionsconfig_center/apollo/impl_test.go
- config_center/apollo/listener.go 26 additions, 12 deletionsconfig_center/apollo/listener.go
- config_center/nacos/client.go 5 additions, 2 deletionsconfig_center/nacos/client.go
- config_center/nacos/listener.go 1 addition, 0 deletionsconfig_center/nacos/listener.go
- go.mod 2 additions, 3 deletionsgo.mod
- go.sum 77 additions, 0 deletionsgo.sum
- protocol/dubbo/config.go 8 additions, 5 deletionsprotocol/dubbo/config.go
- registry/nacos/registry.go 76 additions, 0 deletionsregistry/nacos/registry.go
- registry/protocol/protocol.go 1 addition, 2 deletionsregistry/protocol/protocol.go
Please register or sign in to comment