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 2021/06/25 19:21:27 UTC

[apisix-docker] 02/02: Merge branch 'master' of https://github.com/apache/apisix-docker into release/apisix-2.7

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

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

commit 42a986bb2a365c39ecb32376bc84a0933c7f49bc
Merge: aee5712 d386ae7
Author: yiyiyimu <wo...@gmail.com>
AuthorDate: Fri Jun 25 15:20:54 2021 -0400

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

 .github/workflows/apisix-docker-test.yaml | 2 +-
 Makefile                                  | 2 +-
 alpine/Dockerfile                         | 2 +-
 centos/Dockerfile                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)