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

wenming pushed a change to branch v1.2
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git.


    omit 1070941  Merge branch 'master' into v1.2
    omit 7440192  bugfix(CI): avoid to install APISIX to `deps` folder, that is 
a bug for older luarocks (#1471)
    omit 46a94d1  doc: fix some doc styles for files in doc/ (#1475)
    omit ea97645  doc: update README_CN.md (#1468)
    omit fe1732c  doc: Add external loggers to the Read Me file (#1454)
    omit 3405b61  doc: fix some doc styles by markdownlint (#1460)
    omit 9baad78  bug(proxy-rewrite): reject invalid header (#1462)
    omit c31edf3  bug: uri safe encode. (#1461)
    omit f39dd6e  bugfix: only allow 127.0.0.1 access admin API and dashboard 
by default. (#1458)
    omit 48b5603  doc:  fixed doc style of how-to-build-cn.md and 
how-to-build.md (#1448)
    omit 8876b7f  doc: fix style for CHANGELOG.md. (#1446)
    omit bead350  travis: When the error message is found, set the exit code to 
1. (#1445)
    omit 04539ae  bugfix(CLI): added `$prefix/deps/share/lua/5.1/?/init.lua` to 
search path. (#1443)
    omit bd5fc91  doc: minor style. (#1442)
    omit 669772f  bugfix: check if the service's upstream node is host. (#1402)
    omit c3893a5  doc: update admin-api doc (#1433)

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/v1.2 (3465713)
            \
             O -- O -- O   (1070941)

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:
 .travis.yml                                     |  2 +
 .travis/linux_apisix_current_luarocks_runner.sh | 19 ++----
 .travis/linux_apisix_master_luarocks_runner.sh  | 22 ++----
 .travis/linux_openresty_runner.sh               | 28 ++------
 .travis/linux_tengine_runner.sh                 | 18 +----
 CHANGELOG.md                                    | 51 ++++----------
 Makefile                                        |  1 -
 README.md                                       |  5 +-
 README_CN.md                                    |  5 +-
 apisix/balancer.lua                             |  3 +-
 apisix/core/utils.lua                           | 50 --------------
 apisix/http/service.lua                         | 36 ++--------
 apisix/plugin.lua                               |  8 ---
 apisix/plugins/proxy-rewrite.lua                | 11 ---
 bin/apisix                                      |  4 +-
 conf/config.yaml                                |  4 +-
 doc/admin-api-cn.md                             | 11 +--
 doc/admin-api.md                                | 14 ++--
 doc/architecture-design-cn.md                   | 30 ++------
 doc/architecture-design.md                      | 30 ++------
 doc/batch-processor.md                          |  3 +
 doc/benchmark-cn.md                             | 13 +---
 doc/benchmark.md                                | 17 +----
 doc/getting-started-cn.md                       |  2 -
 doc/getting-started.md                          |  3 +-
 doc/grpc-proxy-cn.md                            | 12 ++--
 doc/grpc-proxy.md                               |  7 +-
 doc/health-check.md                             |  2 +
 doc/how-to-build-cn.md                          |  8 +--
 doc/how-to-build.md                             |  6 +-
 doc/https-cn.md                                 |  1 -
 doc/https.md                                    |  2 +-
 doc/plugin-develop-cn.md                        |  6 +-
 doc/plugin-develop.md                           |  3 +-
 doc/plugins-cn.md                               |  1 -
 doc/plugins.md                                  |  2 -
 doc/plugins/limit-count-cn.md                   | 13 +---
 doc/plugins/limit-count.md                      | 11 +--
 doc/profile-cn.md                               |  2 +
 doc/profile.md                                  |  3 +-
 doc/router-radixtree.md                         |  1 +
 doc/stand-alone-cn.md                           |  9 +--
 doc/stream-proxy-cn.md                          |  3 +-
 doc/stream-proxy.md                             |  2 +-
 rockspec/apisix-master-0.rockspec               |  1 -
 t/APISIX.pm                                     |  8 +--
 t/lib/test_admin.lua                            | 25 ++-----
 t/node/merge-route.t                            | 91 -------------------------
 t/plugin/proxy-rewrite.t                        | 86 -----------------------
 utils/install-apisix.sh                         |  8 +--
 50 files changed, 137 insertions(+), 566 deletions(-)

Reply via email to