Merge remote-tracking branch 'upstream/master' into develop

README.md

@@ -10,13 +10,17 @@ Apache Dubbo Go Implementation.
 
 Apache License, Version 2.0
 
+## Release note ##
+
+[v1.0.0 - May 29, 2019 compatible with dubbo v2.6.5](https://github.com/dubbo/go-for-apache-dubbo/releases/tag/v1.0.0)
+
 ## Code design ##
 
 Extension module and layered code design based on dubbo (include protocol layer,registry layer,cluster layer,config layer and so on), Our goal is: you can implement these layered interfaces in a new way, and override the default implementation of dubbo-go[same go-for-apache-dubbo] by calling 'extension.SetXXX' of extension, and complete your special needs without modifying the source code. At the same time, you are welcome to contribute implementation of useful expansion to the community.
 
 ![frame design](https://raw.githubusercontent.com/wiki/dubbo/dubbo-go/dubbo-go%E4%BB%A3%E7%A0%81%E5%88%86%E5%B1%82%E8%AE%BE%E8%AE%A1.png)
 
-About detail design please refer to [code layered design](https://github.com/dubbo/go-for-apache-dubbo/wiki/dubbo-go-V2.6-design)
+About detail design please refer to [code layered design](https://github.com/dubbo/go-for-apache-dubbo/wiki/dubbo-go-V1.0-design)
 
 ## Feature list ##
 

README_CN.md

@@ -10,20 +10,17 @@ Apache Dubbo Go 语言实现
 
 Apache License, Version 2.0
 
+## 发布日志 ##
+
+[v1.0.0 - 2019年5月29日 兼容dubbo v2.6.5 版本](https://github.com/dubbo/go-for-apache-dubbo/releases/tag/v1.0.0)
+
 ## 代码设计 ##
-<<<<<<< HEAD
-基于dubbo的分层代码设计( protocol layer , registry layer , cluster layer , config 等等)，你可以通过调用“ extension.SetXXX ”拓展这些分层替换 dubbo 的默认拓展来实现你的需求。欢迎贡献你觉得好的拓展。
-=======
->>>>>>> upstream/develop
 
 基于dubbo的extension模块和分层的代码设计(包括 protocol layer, registry layer, cluster layer, config 等等)。我们的目标是：你可以对这些分层接口进行新的实现，并通过调用 extension 模块的“ extension.SetXXX ”方法来覆盖 dubbo-go [同 go-for-apache-dubbo ]的默认实现，以完成自己的特殊需求而无需修改源代码。同时，欢迎你为社区贡献有用的拓展实现。
 
-<<<<<<< HEAD
-=======
 ![框架设计](https://raw.githubusercontent.com/wiki/dubbo/dubbo-go/dubbo-go%E4%BB%A3%E7%A0%81%E5%88%86%E5%B1%82%E8%AE%BE%E8%AE%A1.png)
 
->>>>>>> upstream/develop
-关于详细设计请阅读 [code layered design](https://github.com/dubbo/go-for-apache-dubbo/wiki/dubbo-go-V2.6-design)
+关于详细设计请阅读 [code layered design](https://github.com/dubbo/go-for-apache-dubbo/wiki/dubbo-go-V1.0-design)
 
 ## 功能列表 ##