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

shuyangw pushed a commit to branch release/test
in repository https://gitbox.apache.org/repos/asf/apisix.git

commit 50803249257195a644092ea648277bfd8f86b146
Merge: 1779777 153e847
Author: yiyiyimu <[email protected]>
AuthorDate: Mon Feb 8 20:39:11 2021 +0800

    Merge branch 'master' of https://github.com/apache/incubator-apisix into 
release-test

 .github/workflows/chaos.yml                |   10 +-
 .github/workflows/spellchecker.yml         |    2 -
 .travis/linux_openresty_common_runner.sh   |    2 +-
 README.md                                  |    8 +-
 README_CN.md                               |    6 +-
 apisix/core/utils.lua                      |    7 +-
 apisix/plugins/tcp-logger.lua              |    2 +-
 apisix/plugins/zipkin.lua                  |   43 +-
 apisix/plugins/zipkin/codec.lua            |   12 +-
 apisix/plugins/zipkin/random_sampler.lua   |   10 +-
 doc/admin-api.md                           |   14 +-
 doc/architecture-design.md                 |    2 +-
 doc/discovery.md                           |    2 +-
 doc/install-dependencies.md                |    8 +-
 doc/plugin-develop.md                      |   14 +-
 doc/plugins/authz-keycloak.md              |    2 +-
 doc/plugins/batch-requests.md              |    6 +-
 doc/plugins/cors.md                        |    6 +-
 doc/plugins/dubbo-proxy.md                 |   14 +-
 doc/plugins/echo.md                        |    2 +-
 doc/plugins/response-rewrite.md            |    2 +-
 doc/plugins/skywalking.md                  |   12 +-
 doc/zh-cn/getting-started.md               |    2 +-
 doc/zh-cn/install-dependencies.md          |    8 +-
 doc/zh-cn/plugin-develop.md                |   16 +-
 t/APISIX.pm                                |   21 +
 t/chaos/go.mod                             |   30 +
 t/chaos/go.sum                             | 1042 ++++++++++++++++++++++++++++
 t/chaos/kill-etcd_test.go                  |  204 +-----
 t/chaos/kube_utils.go                      |  102 +++
 t/chaos/{utils.sh => setup_chaos_utils.sh} |    0
 t/chaos/{kill-etcd_test.go => utils.go}    |   98 +--
 t/core/etcd-auth-fail.t                    |    3 +-
 t/core/etcd-auth.t                         |    3 +-
 t/coredns/Corefile                         |    4 +
 t/coredns/db.test.local                    |   13 +
 t/lib/server.lua                           |   10 +
 t/node/upstream-domain-with-special-dns.t  |   71 ++
 t/plugin/zipkin.t                          |  187 +++++
 utils/centos7-ci.sh                        |    2 +-
 utils/linux-install-luarocks.sh            |    3 +-
 utils/set-dns.sh                           |   14 +
 42 files changed, 1653 insertions(+), 366 deletions(-)

Reply via email to