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/02/22 11:50:06 UTC
[dubbo-go] branch 1.5 updated: Rft: remove trailing whitespace
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/1.5 by this push:
new 9605504 Rft: remove trailing whitespace
new d72fcd4 Merge pull request #1049 from jbampton/remove-trailing-whitespace
9605504 is described below
commit 96055045e30c33867f912c47e55dcafd9630de45
Author: John Bampton <jb...@gmail.com>
AuthorDate: Fri Feb 12 16:54:44 2021 +1000
Rft: remove trailing whitespace
---
.github/PULL_REQUEST_TEMPLATE.md | 2 +-
CHANGE.md | 40 ++++++++++++-------------
cluster/router/condition/app_router_test.go | 2 +-
config/testdata/router_config.yml | 2 +-
config/testdata/router_config_error.yml | 2 +-
contributing.md | 6 ++--
doc/apache/apache-release-procedure-20200306.md | 10 +++----
remoting/consul/test_agent.go | 2 +-
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9daa310..0c5d3e0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
<!-- Thanks for sending a pull request!
-Read https://github.com/apache/dubbo-go/blob/master/contributing.md before commit pull request.
+Read https://github.com/apache/dubbo-go/blob/master/contributing.md before commit pull request.
-->
**What this PR does**:
diff --git a/CHANGE.md b/CHANGE.md
index e60e0b0..3c3ed5f 100644
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -8,16 +8,16 @@
## 1.5.4
### Bugfixes
-- [Fix etcd cluster reconnect](https://github.com/apache/dubbo-go/pull/828)
-- [Fix zookeeper deadlock problem](https://github.com/apache/dubbo-go/pull/826)
-- [Fix generic struct2MapAll](https://github.com/apache/dubbo-go/pull/822)
-- [Fix Consumer panic when restart provider](https://github.com/apache/dubbo-go/pull/803)
+- [Fix etcd cluster reconnect](https://github.com/apache/dubbo-go/pull/828)
+- [Fix zookeeper deadlock problem](https://github.com/apache/dubbo-go/pull/826)
+- [Fix generic struct2MapAll](https://github.com/apache/dubbo-go/pull/822)
+- [Fix Consumer panic when restart provider](https://github.com/apache/dubbo-go/pull/803)
- [Fix etcd can not registry](https://github.com/apache/dubbo-go/pull/819) [@lin-jianjun](https://github.com/lin-jianjun)
-- [Fix cannot call go provider service when used by java dubbo 2.7.7 version](https://github.com/apache/dubbo-go/pull/815) [@jack15083](https://github.com/jack15083)
-- [Fix go client quit abnormally when it connects java server](https://github.com/apache/dubbo-go/pull/820) [@wenxuwan](https://github.com/wenxuwan)
-- [Fix sentinel windows issue](https://github.com/apache/dubbo-go/pull/821) [@louyuting](https://github.com/louyuting)
-- [Fix metadata default port](https://github.com/apache/dubbo-go/pull/821) [@sanxun0325](https://github.com/sanxun0325)
-- [Fix consul can not destory](https://github.com/apache/dubbo-go/pull/788) [@LaurenceLiZhixin](https://github.com/LaurenceLiZhixin)
+- [Fix cannot call go provider service when used by java dubbo 2.7.7 version](https://github.com/apache/dubbo-go/pull/815) [@jack15083](https://github.com/jack15083)
+- [Fix go client quit abnormally when it connects java server](https://github.com/apache/dubbo-go/pull/820) [@wenxuwan](https://github.com/wenxuwan)
+- [Fix sentinel windows issue](https://github.com/apache/dubbo-go/pull/821) [@louyuting](https://github.com/louyuting)
+- [Fix metadata default port](https://github.com/apache/dubbo-go/pull/821) [@sanxun0325](https://github.com/sanxun0325)
+- [Fix consul can not destory](https://github.com/apache/dubbo-go/pull/788) [@LaurenceLiZhixin](https://github.com/LaurenceLiZhixin)
Milestone: [https://github.com/apache/dubbo-go/milestone/6](https://github.com/apache/dubbo-go/milestone/6?closed=1)
@@ -28,23 +28,23 @@ Milestone: [https://github.com/apache/dubbo-go/milestone/6](https://github.com/a
- [Add File system service discovery](https://github.com/apache/dubbo-go/pull/732) [@DogBaoBao](https://github.com/DogBaoBao)
- [Migrate travis Ci to Github Actions](https://github.com/apache/dubbo-go/pull/752) [@sdttttt](https://github.com/sdttttt)
- [Add sentinel-golang flow control/circuit breaker](https://github.com/apache/dubbo-go/pull/748) [@louyuting](https://github.com/louyuting)
-- [Add dubbo-go docs and blog into doc directory](https://github.com/apache/dubbo-go/pull/767) [@oaoit](https://github.com/oaoit)
+- [Add dubbo-go docs and blog into doc directory](https://github.com/apache/dubbo-go/pull/767) [@oaoit](https://github.com/oaoit)
### Enhancement
- [Add address notification batch mode](https://github.com/apache/dubbo-go/pull/741) [@beiwei30](https://github.com/beiwei30)
- [Refactor network and codec model](https://github.com/apache/dubbo-go/pull/673) [@fangyincheng](https://github.com/fangyincheng) [@georgehao](https://github.com/georgehao)
- [Remove unnecessary return and judgement](https://github.com/apache/dubbo-go/pull/730) [@YongHaoWu](https://github.com/YongHaoWu)
- [Improve exporter append method](https://github.com/apache/dubbo-go/pull/722) [@gaoxinge](https://github.com/gaoxinge)
-- [Refactor for proxyInvoker cannot be extended](https://github.com/apache/dubbo-go/pull/747) [@cvictory](https://github.com/cvictory)
-- [Refactor attachment type from map\[string\]stiring to map\[string\]interface{}](https://github.com/apache/dubbo-go/pull/713) [@cvictory](https://github.com/cvictory)
-- [Improve map access concurrency](https://github.com/apache/dubbo-go/pull/739) [@skyao](https://github.com/skyao)
-- [Improve code quantity](https://github.com/apache/dubbo-go/pull/763) [@gaoxinge](https://github.com/gaoxinge)
+- [Refactor for proxyInvoker cannot be extended](https://github.com/apache/dubbo-go/pull/747) [@cvictory](https://github.com/cvictory)
+- [Refactor attachment type from map\[string\]stiring to map\[string\]interface{}](https://github.com/apache/dubbo-go/pull/713) [@cvictory](https://github.com/cvictory)
+- [Improve map access concurrency](https://github.com/apache/dubbo-go/pull/739) [@skyao](https://github.com/skyao)
+- [Improve code quantity](https://github.com/apache/dubbo-go/pull/763) [@gaoxinge](https://github.com/gaoxinge)
### Bugfixes
-- [Fix etcdv3 lease](https://github.com/apache/dubbo-go/pull/738) [@zhangshen023](https://github.com/zhangshen023)
-- [Fix rename SethealthChecker to SetHealthChecker](https://github.com/apache/dubbo-go/pull/746) [@watermelo](https://github.com/watermelo)
-- [Fix init config problem in HystrixFilter](https://github.com/apache/dubbo-go/pull/731) [@YGrylls](https://github.com/YGrylls)
-- [Fix zookeeper listener report error after started](https://github.com/apache/dubbo-go/pull/735) [@wenxuwan](https://github.com/wenxuwan)
+- [Fix etcdv3 lease](https://github.com/apache/dubbo-go/pull/738) [@zhangshen023](https://github.com/zhangshen023)
+- [Fix rename SethealthChecker to SetHealthChecker](https://github.com/apache/dubbo-go/pull/746) [@watermelo](https://github.com/watermelo)
+- [Fix init config problem in HystrixFilter](https://github.com/apache/dubbo-go/pull/731) [@YGrylls](https://github.com/YGrylls)
+- [Fix zookeeper listener report error after started](https://github.com/apache/dubbo-go/pull/735) [@wenxuwan](https://github.com/wenxuwan)
Milestone: [https://github.com/apache/dubbo-go/milestone/4](https://github.com/apache/dubbo-go/milestone/4?closed=1)
@@ -171,7 +171,7 @@ Project: [https://github.com/apache/dubbo-go/projects/8](https://github.com/apac
- [Add grpc protocol](https://github.com/apache/dubbo-go/pull/311)
### Enhancement
-
+
- [The SIGSYS and SIGSTOP are not supported in windows platform](https://github.com/apache/dubbo-go/pull/262)
- [Error should be returned when `NewURL` failed](https://github.com/apache/dubbo-go/pull/266)
- [Split config center GetConfig method](https://github.com/apache/dubbo-go/pull/267)
@@ -181,7 +181,7 @@ Project: [https://github.com/apache/dubbo-go/projects/8](https://github.com/apac
- [Change zk version and add base_registry](https://github.com/apache/dubbo-go/pull/355)
### Bugfixes
-
+
- [Fix negative wait group count](https://github.com/apache/dubbo-go/pull/253)
- [After disconnection with ZK registry, cosumer can't listen to provider changes](https://github.com/apache/dubbo-go/pull/258)
- [The generic filter and default reference filters lack ','](https://github.com/apache/dubbo-go/pull/260)
diff --git a/cluster/router/condition/app_router_test.go b/cluster/router/condition/app_router_test.go
index c8bc43e..8258fee 100644
--- a/cluster/router/condition/app_router_test.go
+++ b/cluster/router/condition/app_router_test.go
@@ -109,7 +109,7 @@ force: true
runtime: false
conditions:
- => host != 172.22.3.91
- - host = 192.168.199.208 => host = 192.168.199.208
+ - host = 192.168.199.208 => host = 192.168.199.208
`
ts, z, _, err := zookeeper.NewMockZookeeperClient("test", 15*time.Second)
assert.NoError(t, err)
diff --git a/config/testdata/router_config.yml b/config/testdata/router_config.yml
index 1845650..eec4c86 100644
--- a/config/testdata/router_config.yml
+++ b/config/testdata/router_config.yml
@@ -1,5 +1,5 @@
# dubbo router yaml configure file
-routerRules:
+routerRules:
- scope: application
key: mock-app
priority: 1
diff --git a/config/testdata/router_config_error.yml b/config/testdata/router_config_error.yml
index 74e89cc..1a1fda6 100644
--- a/config/testdata/router_config_error.yml
+++ b/config/testdata/router_config_error.yml
@@ -1,5 +1,5 @@
# dubbo router yaml configure file
-routerRules:
+routerRules:
- priority: 1
force: true
noConditions :
diff --git a/contributing.md b/contributing.md
index 5130151..0da1281 100644
--- a/contributing.md
+++ b/contributing.md
@@ -40,7 +40,7 @@ The title format of the pull request `MUST` follow the following rules:
>- 1 there should be comment for every export func/var.
>- 2 the comment should begin with function name/var name.
-### 3.4 import
+### 3.4 import
We dubbogo import blocks should be splited into 3 blocks.
@@ -53,12 +53,12 @@ import (
// block 2: the third package
import (
"github.com/dubbogo/xxx"
-
+
"github.com/RoaringBitmap/roaring"
)
// block 3: the dubbo-go package
import (
"github.com/apache/dubbo-go/common"
-)
+)
```
\ No newline at end of file
diff --git a/doc/apache/apache-release-procedure-20200306.md b/doc/apache/apache-release-procedure-20200306.md
index 3f677ff..a36e2b0 100644
--- a/doc/apache/apache-release-procedure-20200306.md
+++ b/doc/apache/apache-release-procedure-20200306.md
@@ -21,7 +21,7 @@ Apache开源软件是有社区驱动的，为了提高发布软件质量而指
## 1. 发版准备
-发版文件需要签名，需要安装pgp工具.
+发版文件需要签名，需要安装pgp工具.
```bash
$ brew install gpg
@@ -167,7 +167,7 @@ $ svn commit --username wongoo -m "Release dubbo-go-hessian2 v1.4.0-rc1"
发任何邮件都是有一定格式的，你加入社区邮件列表后，就会收到很多这样的邮件，多看看就知道了，具体邮件范本参考文章后面的邮件范本。
发完【VOTE】邮件，私下沟通群里面请大佬PMC投票。
-PMC投票会对你上传打包文件进行相关检查,
+PMC投票会对你上传打包文件进行相关检查,
详细可以了解孵化中的项目发布完整的检查项参考： https://cwiki.apache.org/confluence/display/INCUBATOR2/IncubatorReleaseChecklist
收到3个binding邮件且超过72小时后，就可以发 投票结果 [RESULT] [VOTE] 邮件了。
@@ -185,7 +185,7 @@ PMC投票会对你上传打包文件进行相关检查,
## 5. 发布版本
-当正式发布投票成功后，先发[Result]邮件，然后就准备 release package。
+当正式发布投票成功后，先发[Result]邮件，然后就准备 release package。
将之前在dev下发布的对应rc文件夹下的源码包、签名文件和hash文件拷贝到另一个目录 v1.4.0，
注意文件名字中不要rcxx (可以rename，但不要重新计算签名，hash可以重新计算，结果不会变)。
@@ -253,7 +253,7 @@ Hello Dubbo/Dubbogo Community,
[ ] +1 approve
[ ] +0 no opinion
[ ] -1 disapprove with the reason
-
+
Thanks,
The Apache Dubbo-go Team
```
@@ -284,7 +284,7 @@ between text And link. I suggest add one to make it looks better. <--- 一些
I checked the following items:
[v] Are release files in correct location? <-- 发布文件目录是否正确
-[v] Do release files have the word incubating in their name?
+[v] Do release files have the word incubating in their name?
[v] Are the digital signature and hashes correct? <-- 签名、hash是否正确
[v] Do LICENSE and NOTICE files exists?
[v] Is the LICENSE and NOTICE text correct? <-- 协议文本是否正确
diff --git a/remoting/consul/test_agent.go b/remoting/consul/test_agent.go
index f6ba336..2c5c13f 100644
--- a/remoting/consul/test_agent.go
+++ b/remoting/consul/test_agent.go
@@ -30,7 +30,7 @@ import (
// an embedded consul server.
func NewConsulAgent(t *testing.T, port int) *agent.TestAgent {
hcl := `
- ports {
+ ports {
http = ` + strconv.Itoa(port) + `
}
`