Mod:resolve conflict (3217c34d) · Commits · Summer2022 / 22a7f0099 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

2

22a7f0099
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3217c34d

Commit 3217c34d authored 4 years ago by

vito.he

Downloads
- Plain Diff

Mod:resolve conflict

parents 2a89363d bdd57ef5

No related branches found

No related tags found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

common/constant/key.go 6 additions, 0 deletions

common/constant/key.go
common/extension/service_discovery.go 45 additions, 0 deletions

common/extension/service_discovery.go
go.mod 1 addition, 1 deletion

go.mod
go.sum 2 additions, 0 deletions

go.sum
registry/event.go 20 additions, 1 deletion

registry/event.go
registry/event_listener.go 1 addition, 0 deletions

registry/event_listener.go
registry/nacos/base_registry.go 102 additions, 0 deletions

registry/nacos/base_registry.go
registry/nacos/registry.go 7 additions, 57 deletions

registry/nacos/registry.go
registry/nacos/service_discovery.go 285 additions, 0 deletions

registry/nacos/service_discovery.go
registry/nacos/service_discovery_test.go 122 additions, 0 deletions

registry/nacos/service_discovery_test.go
registry/service_discovery.go 4 additions, 9 deletions

registry/service_discovery.go
registry/service_instance.go 48 additions, 2 deletions

registry/service_instance.go

with 643 additions and 70 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment