Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reduce common directory #1948

Merged
merged 9 commits into from
Jul 7, 2022
Merged

reduce common directory #1948

merged 9 commits into from
Jul 7, 2022

Conversation

Leospard
Copy link
Contributor

@Leospard Leospard commented Jul 1, 2022

What this PR does:
reduce common directory
Which issue(s) this PR fixes:
Fixes # #1937

You should pay attention to items below to ensure your pr passes our ci test
We do not merge pr with ci tests failed

  • All ut passed (run 'go test ./...' in project root)
  • After go-fmt ed , run 'go fmt project' using goland.
  • Golangci-lint passed, run 'sudo golangci-lint run' in project root.
  • After import formatted, (using imports-formatter to run 'imports-formatter .' in project root, to format your import blocks, mentioned in CONTRIBUTING.md above)
  • Your new-created file needs to have apache license at the top, like other existed file does.
  • All integration test passed. You can run integration test locally (with docker env). Clone our dubbo-go-samples project and replace the go.mod to your dubbo-go, and run 'sudo sh start_integration_test.sh' at root of samples project root. (M1 Slice is not Support)

dependabot bot and others added 5 commits June 10, 2022 13:07
….0 (apache#1929)

Bumps [github.com/emicklei/go-restful/v3](https://github.com/emicklei/go-restful) from 3.7.4 to 3.8.0.
- [Release notes](https://github.com/emicklei/go-restful/releases)
- [Changelog](https://github.com/emicklei/go-restful/blob/v3/CHANGES.md)
- [Commits](emicklei/go-restful@v3.7.4...v3.8.0)

---
updated-dependencies:
- dependency-name: github.com/emicklei/go-restful/v3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@@ -30,7 +30,10 @@ import (
)

import (
dubboLogger "dubbo.apache.org/dubbo-go/v3/common/logger"
dubboLogger "github.com/dubbogo/gost/log/logger"
Copy link
Contributor

@AlexStocks AlexStocks Jul 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls rename its name to 'dubbogoLogger'. pls change all codes in other places.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK👌

@Leospard Leospard changed the base branch from master to 3.0 July 4, 2022 08:29
@AlexStocks
Copy link
Contributor

pls fix the confliction

@AlexStocks AlexStocks merged commit 53221fa into apache:3.0 Jul 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants