You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2020/12/27 04:24:01 UTC
[dubbo-go] branch develop updated (563b345 -> 8a626dd)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.
discard 563b345 Merge pull request #958 from yakecanlee/feature/fix-tracing-filter
new 8a626dd Merge pull request #958 from yakecanlee/feature/fix-tracing-filter
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (563b345)
\
N -- N -- N refs/heads/develop (8a626dd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/github-actions.yml | 6 ------
1 file changed, 6 deletions(-)
[dubbo-go] 01/01: Merge pull request #958 from
yakecanlee/feature/fix-tracing-filter
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 8a626dd8a79e0a484d63da8216111d921f3706c7
Merge: de2dad9 44f7199
Author: Xin.Zh <dr...@foxmail.com>
AuthorDate: Sat Dec 26 07:21:30 2020 +0800
Merge pull request #958 from yakecanlee/feature/fix-tracing-filter
Fix: fix the wrong judgment in rpc result error
.github/workflows/github-actions.yml | 5 +++++
Makefile | 6 +++++-
filter/filter_impl/tracing_filter.go | 2 +-
go.mod | 1 +
go.sum | 2 ++
5 files changed, 14 insertions(+), 2 deletions(-)
diff --cc .github/workflows/github-actions.yml
index 76aa42d,76aa42d..67b450e
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@@ -58,6 -58,6 +58,11 @@@ jobs
run: |
make verify
++ - name: Validate License
++ run: |
++ sh before_validate_license.sh
++ chmod u+x /tmp/tools/license/license-header-checker
++ /tmp/tools/license/license-header-checker -v -a -r -i vendor /tmp/tools/license/license.txt . go && [[ -z `git status -s` ]]
- name: Integrate Test
run: |
diff --cc Makefile
index 2f6c9bd,2f6c9bd..9728937
--- a/Makefile
+++ b/Makefile
@@@ -67,8 -67,8 +67,12 @@@ deps: prepar
license: clean prepareLic
$(GO_LICENSE_CHECKER) -v -a -r -i vendor $(LICENSE_DIR)/license.txt . go && [[ -z `git status -s` ]]
++.PHONY: linter
++ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.33.0
++ golangci-lint run --timeout=15m -v
++
.PHONY: verify
--verify: clean license test
++verify: clean license linter test
.PHONY: clean
clean: prepare
diff --cc go.mod
index 94509de,94509de..2e3f077
--- a/go.mod
+++ b/go.mod
@@@ -39,6 -39,6 +39,7 @@@ require
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.6.1
github.com/zouyx/agollo/v3 v3.4.5
++ go.etcd.io/bbolt v1.3.5 // indirect
go.uber.org/atomic v1.7.0
go.uber.org/zap v1.16.0
google.golang.org/grpc v1.26.0
diff --cc go.sum
index 201f03e,201f03e..afcd5c7
--- a/go.sum
+++ b/go.sum
@@@ -999,6 -999,6 +999,8 @@@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyR
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
++go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
++go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=