You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@dubbo.apache.org by ma...@apache.org on 2021/11/07 11:10:59 UTC

[dubbo-go-pixiu] 01/01: Merge branch '0.4.0' of github.com:apache/dubbo-go-pixiu into feature/git_gc

This is an automated email from the ASF dual-hosted git repository.

mark4z pushed a commit to branch feature/git_gc
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git

commit 55cb8cb067e6f69ccd0831eb5b1d6d53384ac6bf
Merge: 24d579c 2412e00
Author: mengchao.lv <me...@lianwei.com.cn>
AuthorDate: Sun Nov 7 19:10:30 2021 +0800

    Merge branch '0.4.0' of github.com:apache/dubbo-go-pixiu into feature/git_gc
    
     Conflicts:
    	go.mod
    	go.sum
    	pkg/common/http/manager.go
    	pkg/context/http/context.go
    	pkg/pluginregistry/registry.go
    	pkg/server/listener.go

 go.mod                         |  9 ++----
 go.sum                         | 67 +++++++-----------------------------------
 pkg/common/http/manager.go     |  1 +
 pkg/context/http/context.go    |  1 -
 pkg/pluginregistry/registry.go |  1 -
 pkg/server/listener.go         |  1 -
 6 files changed, 14 insertions(+), 66 deletions(-)