This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new b1e3a78 feat: release 2.10.1 (#5325)
b1e3a78 is described below
commit b1e3a78360559a6cc83e3fdc5e3ec59440506fb4
Author: 罗泽轩 <[email protected]>
AuthorDate: Mon Oct 25 22:00:45 2021 +0800
feat: release 2.10.1 (#5325)
---
CHANGELOG.md | 13 ++++++
apisix/core/version.lua | 2 +-
docs/en/latest/config.json | 2 +-
docs/en/latest/how-to-build.md | 14 +++---
docs/zh/latest/CHANGELOG.md | 13 ++++++
docs/zh/latest/config.json | 2 +-
docs/zh/latest/how-to-build.md | 14 +++---
rockspec/apisix-2.10.1-0.rockspec | 95 +++++++++++++++++++++++++++++++++++++++
8 files changed, 138 insertions(+), 17 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cb40fc..790a4b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ title: Changelog
## Table of Contents
+- [2.10.1](#2101)
- [2.10.0](#2100)
- [2.9.0](#290)
- [2.8.0](#280)
@@ -46,6 +47,18 @@ title: Changelog
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.10.1
+
+### Bugfix
+
+- fix(zipkin): response_span doesn't have correct start time
[#5295](https://github.com/apache/apisix/pull/5295)
+- fix(ext-plugin): don't use stale key
[#5309](https://github.com/apache/apisix/pull/5309)
+- fix: route's timeout should not be overwrittern by service
[#5219](https://github.com/apache/apisix/pull/5219)
+- fix: filter nil plugin conf triggered by etcd dir init
[#5204](https://github.com/apache/apisix/pull/5204)
+- fix: pass correct host header to health checker target nodes
[#5175](https://github.com/apache/apisix/pull/5175)
+- fix: upgrade lua-resty-balancer to 0.04
[#5144](https://github.com/apache/apisix/pull/5144)
+- fix(prometheus): avoid negative latency caused by inconsistent Nginx metrics
[#5150](https://github.com/apache/apisix/pull/5150)
+
## 2.10.0
### Change
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index 6217100..350f101 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -15,5 +15,5 @@
-- limitations under the License.
--
return {
- VERSION = "2.10.0"
+ VERSION = "2.10.1"
}
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index deabb64..7c88b9c 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": "2.10.0",
+ "version": "2.10.1",
"sidebar": [
{
"type": "category",
diff --git a/docs/en/latest/how-to-build.md b/docs/en/latest/how-to-build.md
index 799c47b..8a2d898 100644
--- a/docs/en/latest/how-to-build.md
+++ b/docs/en/latest/how-to-build.md
@@ -56,7 +56,7 @@ sudo yum install -y
https://repos.apiseven.com/packages/centos/apache-apisix-rep
This installation method is suitable for CentOS 7, please run the following
command to install Apache APISIX.
```shell
-sudo yum install -y
https://github.com/apache/apisix/releases/download/2.10.0/apisix-2.10.0-0.el7.x86_64.rpm
+sudo yum install -y
https://github.com/apache/apisix/releases/download/2.10.1/apisix-2.10.1-0.el7.x86_64.rpm
```
> You can also install the RPM package via running `sudo yum install -y
> https://repos.apiseven.com/packages/centos/7/x86_64/apisix-2.10.0-0.el7.x86_64.rpm`.
@@ -71,16 +71,16 @@ Please refer to: [Installing Apache APISIX with Helm
Chart](https://github.com/a
### Installation via Source Release Package
-1. Create a directory named `apisix-2.10.0`.
+1. Create a directory named `apisix-2.10.1`.
```shell
- mkdir apisix-2.10.0
+ mkdir apisix-2.10.1
```
2. Download Apache APISIX Release source package.
```shell
- wget https://downloads.apache.org/apisix/2.10.0/apache-apisix-2.10.0-src.tgz
+ wget https://downloads.apache.org/apisix/2.10.1/apache-apisix-2.10.1-src.tgz
```
You can also download the Apache APISIX Release source package from the
Apache APISIX website. The [Apache APISIX Official Website - Download
Page](https://apisix.apache.org/downloads/) also provides source packages for
Apache APISIX, APISIX Dashboard and APISIX Ingress Controller.
@@ -88,14 +88,14 @@ Please refer to: [Installing Apache APISIX with Helm
Chart](https://github.com/a
3. Unzip the Apache APISIX Release source package.
```shell
- tar zxvf apache-apisix-2.10.0-src.tgz -C apisix-2.10.0
+ tar zxvf apache-apisix-2.10.1-src.tgz -C apisix-2.10.1
```
4. Install the runtime dependent Lua libraries.
```shell
- # Switch to the apisix-2.10.0 directory
- cd apisix-2.10.0
+ # Switch to the apisix-2.10.1 directory
+ cd apisix-2.10.1
# Create dependencies
make deps
# Install apisix command
diff --git a/docs/zh/latest/CHANGELOG.md b/docs/zh/latest/CHANGELOG.md
index 8546b34..4d683c8 100644
--- a/docs/zh/latest/CHANGELOG.md
+++ b/docs/zh/latest/CHANGELOG.md
@@ -23,6 +23,7 @@ title: CHANGELOG
## Table of Contents
+- [2.10.1](#2101)
- [2.10.0](#2100)
- [2.9.0](#290)
- [2.8.0](#280)
@@ -46,6 +47,18 @@ title: CHANGELOG
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.10.1
+
+### Bugfix
+
+- 更正 zipkin 插件 response_span 的开始时间
[#5295](https://github.com/apache/apisix/pull/5295)
+- 避免发送过期 key 给 plugin runner
[#5309](https://github.com/apache/apisix/pull/5309)
+- 更正 route 的 timeout 被 service 覆盖的问题
[#5219](https://github.com/apache/apisix/pull/5219)
+- 过滤掉初始化 etcd 数据时产生的空 plugin conf
[#5204](https://github.com/apache/apisix/pull/5204)
+- 健康检查特定情况下会发送错误的 Host header
[#5175](https://github.com/apache/apisix/pull/5175)
+- 升级 lua-resty-balancer 到 0.04
[#5144](https://github.com/apache/apisix/pull/5144)
+- prometheus 插件修复偶发的 latency 为负数的问题
[#5150](https://github.com/apache/apisix/pull/5150)
+
## 2.10.0
### Change
diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json
index 5e8f25a..d225a63 100644
--- a/docs/zh/latest/config.json
+++ b/docs/zh/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": "2.10.0",
+ "version": "2.10.1",
"sidebar": [
{
"type": "category",
diff --git a/docs/zh/latest/how-to-build.md b/docs/zh/latest/how-to-build.md
index cebac9e..cfcfa6f 100644
--- a/docs/zh/latest/how-to-build.md
+++ b/docs/zh/latest/how-to-build.md
@@ -56,7 +56,7 @@ sudo yum install -y
https://repos.apiseven.com/packages/centos/apache-apisix-rep
这种安装方式适用于 CentOS 7 操作系统，请运行以下命令安装 Apache APISIX。
```shell
-sudo yum install -y
https://github.com/apache/apisix/releases/download/2.10.0/apisix-2.10.0-0.el7.x86_64.rpm
+sudo yum install -y
https://github.com/apache/apisix/releases/download/2.10.1/apisix-2.10.1-0.el7.x86_64.rpm
```
> 您也可以运行 `sudo yum install -y
> https://repos.apiseven.com/packages/centos/7/x86_64/apisix-2.10.0-0.el7.x86_64.rpm`
> 命令安装。
@@ -71,16 +71,16 @@ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.10.0/ap
### 通过源码包安装
-1. 创建一个名为 `apisix-2.10.0` 的目录。
+1. 创建一个名为 `apisix-2.10.1` 的目录。
```shell
- mkdir apisix-2.10.0
+ mkdir apisix-2.10.1
```
2. 下载 Apache APISIX Release 源码包：
```shell
- wget https://downloads.apache.org/apisix/2.10.0/apache-apisix-2.10.0-src.tgz
+ wget https://downloads.apache.org/apisix/2.10.1/apache-apisix-2.10.1-src.tgz
```
您也可以通过 Apache APISIX 官网下载 Apache APISIX Release 源码包。 Apache APISIX 官网也提供了
Apache APISIX、APISIX Dashboard 和 APISIX Ingress Controller 的源码包，详情请参考[Apache
APISIX 官网-下载页](https://apisix.apache.org/zh/downloads)。
@@ -88,14 +88,14 @@ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.10.0/ap
3. 解压 Apache APISIX Release 源码包：
```shell
- tar zxvf apache-apisix-2.10.0-src.tgz -C apisix-2.10.0
+ tar zxvf apache-apisix-2.10.1-src.tgz -C apisix-2.10.1
```
4. 安装运行时依赖的 Lua 库：
```shell
- # 切换到 apisix-2.10.0 目录
- cd apisix-2.10.0
+ # 切换到 apisix-2.10.1 目录
+ cd apisix-2.10.1
# 创建依赖
make deps
# 安装 apisix 命令
diff --git a/rockspec/apisix-2.10.1-0.rockspec
b/rockspec/apisix-2.10.1-0.rockspec
new file mode 100644
index 0000000..962770a
--- /dev/null
+++ b/rockspec/apisix-2.10.1-0.rockspec
@@ -0,0 +1,95 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+package = "apisix"
+version = "2.10.1-0"
+supported_platforms = {"linux", "macosx"}
+
+source = {
+ url = "git://github.com/apache/apisix",
+ branch = "2.10.1",
+}
+
+description = {
+ summary = "Apache APISIX is a cloud-native microservices API gateway,
delivering the ultimate performance, security, open source and scalable
platform for all your APIs and microservices.",
+ homepage = "https://github.com/apache/apisix";,
+ license = "Apache License 2.0",
+}
+
+dependencies = {
+ "lua-resty-ctxdump = 0.1-0",
+ "lua-resty-dns-client = 5.2.0",
+ "lua-resty-template = 2.0",
+ "lua-resty-etcd = 1.5.4",
+ "api7-lua-resty-http = 0.2.0",
+ "lua-resty-balancer = 0.04",
+ "lua-resty-ngxvar = 0.5.2",
+ "lua-resty-jit-uuid = 0.0.7",
+ "lua-resty-healthcheck-api7 = 2.2.0",
+ "lua-resty-jwt = 0.2.0",
+ "lua-resty-hmac-ffi = 0.05",
+ "lua-resty-cookie = 0.1.0",
+ "lua-resty-session = 2.24",
+ "opentracing-openresty = 0.1",
+ "lua-resty-radixtree = 2.8.1",
+ "lua-protobuf = 0.3.3",
+ "lua-resty-openidc = 1.7.2-1",
+ "luafilesystem = 1.7.0-2",
+ "api7-lua-tinyyaml = 0.3.0",
+ "nginx-lua-prometheus = 0.20210206",
+ "jsonschema = 0.9.5",
+ "lua-resty-ipmatcher = 0.6.1",
+ "lua-resty-kafka = 0.07",
+ "lua-resty-logger-socket = 2.0-0",
+ "skywalking-nginx-lua = 0.4-1",
+ "base64 = 1.5-2",
+ "binaryheap = 0.4",
+ "dkjson = 2.5-2",
+ "resty-redis-cluster = 1.02-4",
+ "lua-resty-expr = 1.3.1",
+ "graphql = 0.0.2",
+ "argparse = 0.7.1-1",
+ "luasocket = 3.0rc1-2",
+ "luasec = 0.9-1",
+ "lua-resty-consul = 0.3-2",
+ "penlight = 1.9.2-1",
+ "ext-plugin-proto = 0.3.0",
+ "casbin = 1.26.0",
+ "api7-snowflake = 2.0-1",
+ "inspect == 3.1.1",
+}
+
+build = {
+ type = "make",
+ build_variables = {
+ CFLAGS="$(CFLAGS)",
+ LIBFLAG="$(LIBFLAG)",
+ LUA_LIBDIR="$(LUA_LIBDIR)",
+ LUA_BINDIR="$(LUA_BINDIR)",
+ LUA_INCDIR="$(LUA_INCDIR)",
+ LUA="$(LUA)",
+ OPENSSL_INCDIR="$(OPENSSL_INCDIR)",
+ OPENSSL_LIBDIR="$(OPENSSL_LIBDIR)",
+ },
+ install_variables = {
+ INST_PREFIX="$(PREFIX)",
+ INST_BINDIR="$(BINDIR)",
+ INST_LIBDIR="$(LIBDIR)",
+ INST_LUADIR="$(LUADIR)",
+ INST_CONFDIR="$(CONFDIR)",
+ },
+}
