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 2021/01/10 12:26:10 UTC
[dubbo-go-samples] 01/01: merge master
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 1.5.5
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit f7e2f53971a2cb4d94286f161da257dfe6be832e
Merge: 86a6f7b 329248b
Author: AlexStocks <al...@foxmail.com>
AuthorDate: Sun Jan 10 20:25:47 2021 +0800
merge master
filter/sentinel/go-client/cmd/client.go | 21 ++-
filter/sentinel/go-server/cmd/server.go | 22 ++-
general/grpc/stream/go-server/app/server.go | 2 -
go.mod | 7 +-
go.sum | 283 +++-------------------------
5 files changed, 66 insertions(+), 269 deletions(-)
diff --cc go.mod
index 43ee29b,25adc4b..cbe44ef
--- a/go.mod
+++ b/go.mod
@@@ -1,8 -1,7 +1,8 @@@
module github.com/apache/dubbo-go-samples
require (
- github.com/apache/dubbo-go v1.5.5-rc1
+ github.com/alibaba/sentinel-golang v0.6.2
- github.com/apache/dubbo-go v1.5.2-0.20201218085108-ce90b4b3a30c
++ github.com/apache/dubbo-go v1.5.5
github.com/apache/dubbo-go-hessian2 v1.7.0
github.com/bwmarrin/snowflake v0.3.0
github.com/dk-lockdown/seata-golang v0.1.0-fix
@@@ -21,6 -20,7 +21,9 @@@
google.golang.org/grpc v1.26.0
)
--replace github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.8.0
++replace (
++ github.com/alibaba/sentinel-golang => github.com/alibaba/sentinel-golang v1.0.1
++ github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.8.0
++)
-replace github.com/alibaba/sentinel-golang => github.com/alibaba/sentinel-golang v1.0.1
go 1.13
diff --cc go.sum
index 9ee03f0,3f49443..475e454
--- a/go.sum
+++ b/go.sum
@@@ -98,17 -78,14 +78,14 @@@ github.com/alecthomas/template v0.0.0-2
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
- github.com/alibaba/sentinel-golang v0.6.2 h1:1OjjpljJbNKWp9p5RJKxOqS1gHGZPUWPlCcokv5xYJs=
- github.com/alibaba/sentinel-golang v0.6.2/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc=
- github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ=
+ github.com/alibaba/sentinel-golang v1.0.1 h1:WlhN0XUxRyfkiDc8TO6CcRrnakwFP9zFtvJTYxZRCgI=
+ github.com/alibaba/sentinel-golang v1.0.1/go.mod h1:QsB99f/z35D2AiMrAWwgWE85kDTkBUIkcmPrRt+61NI=
github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFmb7mUnp8nH9fQBA=
github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk=
- github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
- github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/apache/dubbo-getty v1.3.10 h1:ys5mwjPdxG/KwkPjS6EI0RzQtU6p6FCPoKpaFEzpAL0=
github.com/apache/dubbo-getty v1.3.10/go.mod h1:x6rraK01BL5C7jUM2fPl5KMkAxLVIx54ZB8/XEOik9Y=
- github.com/apache/dubbo-go v1.5.2-0.20201218085108-ce90b4b3a30c h1:Uf6WER5vu8b+O+gs6uuSzvDh4m5T6HujCrabBfZOk1Q=
- github.com/apache/dubbo-go v1.5.2-0.20201218085108-ce90b4b3a30c/go.mod h1:KAty5L/vcHjh3qcTfC4R5Nfd0tkk7MLJnux/IQKfQLg=
-github.com/apache/dubbo-go v1.5.5-rc1 h1:33yiuW9P6U1OVugHplXolB48dWN7B2qEZQWw+aT4VHA=
-github.com/apache/dubbo-go v1.5.5-rc1/go.mod h1:KAty5L/vcHjh3qcTfC4R5Nfd0tkk7MLJnux/IQKfQLg=
++github.com/apache/dubbo-go v1.5.5 h1:bQX+eGANPFl/ldfvctQJdw5HKfTGBpiWx1gaXrrYwMA=
++github.com/apache/dubbo-go v1.5.5/go.mod h1:KAty5L/vcHjh3qcTfC4R5Nfd0tkk7MLJnux/IQKfQLg=
github.com/apache/dubbo-go-hessian2 v1.7.0 h1:u2XxIuepu/zb6JcGZc7EbvKboXdKoJbf7rbmeq6SF1w=
github.com/apache/dubbo-go-hessian2 v1.7.0/go.mod h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=