You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sh...@apache.org on 2020/08/05 11:51:31 UTC

[apisix] branch v1.5 updated (f250f43 -> ac7848e)

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

shuaijinchao pushed a change to branch v1.5
in repository https://gitbox.apache.org/repos/asf/apisix.git.


    omit f250f43  Merge branch 'master' into v1.5
    omit 65df727  feat: script distribute and run (#1982)
    omit 020090c  doc: add Chinese doc of uri-blocker plugin (#1985)
    omit 77dfeca  revert: enable proxy-cache and proxy-mirror plugins by default. (#1992)
    omit c67e998  bugfix: fail to handshake if there is no certificate matched by host. (#1980)
    omit 6adbf02  core: support get_scheme/host/port/http_version in core.request  (#1978)
    omit bb06278  update lua-tinyyaml to 1.0 . (#1981)
    omit d32b5cf  perf: no longer generate unnecessary nginx conf for better performance. (#1968)
    omit 2073087  perf: used empty table if the user is not enabled any plugin. (#1967)
    omit 4cbb324  bugfix(CLI): fix wrong info `Warning! Running apisix under /root` when `make init` at non-root path (#1976)
    omit 90867ed  doc: unified document file name format. (#1969)
    omit e1c6d37  doc: update main picture of APISIX. (#1964)
     add ac7848e  release: resolve master conflict.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f250f43)
            \
             N -- N -- N   refs/heads/v1.5 (ac7848e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 README_CN.md                                       |   2 +-
 apisix/admin/routes.lua                            |  12 --
 apisix/admin/services.lua                          |  13 --
 apisix/core.lua                                    |   1 -
 apisix/core/request.lua                            |  28 ----
 apisix/http/router/radixtree_sni.lua               |   2 +-
 apisix/init.lua                                    |  40 ++----
 apisix/plugin.lua                                  |   4 +-
 apisix/schema_def.lua                              |  11 --
 apisix/script.lua                                  |  59 --------
 benchmark/fake-apisix/conf/nginx.conf              |  29 +---
 benchmark/run.sh                                   |   6 +-
 benchmark/server/conf/nginx.conf                   |   2 +-
 bin/apisix                                         |  23 +--
 conf/config.yaml                                   |   4 +-
 doc/admin-api.md                                   |   1 -
 doc/architecture-design.md                         |  20 ---
 doc/images/apisix.png                              | Bin 124036 -> 287377 bytes
 doc/plugins/authz-keycloak.md                      |   2 +-
 doc/zh-cn/README.md                                |   2 +-
 doc/zh-cn/admin-api.md                             |  11 +-
 doc/zh-cn/architecture-design.md                   |  22 ---
 .../{authz-keycloak.md => authz-keycloak-cn.md}    |   0
 rockspec/apisix-master-0.rockspec                  |   2 +-
 t/admin/routes.t                                   |  43 +-----
 t/admin/upstream.t                                 |   4 +-
 t/core/request.t                                   | 148 -------------------
 t/debug/debug-mode.t                               |   1 +
 t/grpc-proxy-test.sh                               |  17 +--
 t/plugin/request-validation.t                      |   1 +
 t/router/radixtree-sni.t                           |  11 +-
 t/script/script_distribute.t                       | 158 ---------------------
 t/script/script_test.lua                           |  43 ------
 33 files changed, 50 insertions(+), 672 deletions(-)
 delete mode 100644 apisix/script.lua
 rename doc/zh-cn/plugins/{authz-keycloak.md => authz-keycloak-cn.md} (100%)
 delete mode 100644 t/script/script_distribute.t
 delete mode 100644 t/script/script_test.lua