You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ch...@apache.org on 2020/07/20 10:13:42 UTC
[incubator-apisix] branch master updated: release: released 1.4.1
version (#1872)
This is an automated email from the ASF dual-hosted git repository.
chenjunxu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new c1ee898 release: released 1.4.1 version (#1872)
c1ee898 is described below
commit c1ee898a1a2e5f4b5e02e7bc645439e9498f6f74
Author: nic-chen <33...@users.noreply.github.com>
AuthorDate: Mon Jul 20 18:13:31 2020 +0800
release: released 1.4.1 version (#1872)
---
CHANGELOG.md | 9 +++++++++
CHANGELOG_CN.md | 6 ++++++
DISCLAIMER | 5 -----
NOTICE | 2 +-
apisix/core/version.lua | 3 ++-
doc/how-to-build.md | 14 +++++++-------
doc/zh-cn/how-to-build.md | 14 +++++++-------
rockspec/apisix-0.9-0.rockspec | 2 +-
rockspec/apisix-1.0-0.rockspec | 2 +-
rockspec/apisix-1.1-0.rockspec | 2 +-
rockspec/apisix-1.2-0.rockspec | 2 +-
rockspec/apisix-1.3-0.rockspec | 2 +-
rockspec/apisix-1.4-0.rockspec | 4 ++--
.../{apisix-1.4-0.rockspec => apisix-1.4.1-0.rockspec} | 6 +++---
rockspec/apisix-master-0.rockspec | 2 +-
15 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8770248..1ef75ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
# Table of Contents
+
+- [1.4.1](#141)
- [1.4.0](#140)
- [1.3.0](#130)
- [1.2.0](#120)
@@ -29,6 +31,13 @@
- [0.7.0](#070)
- [0.6.0](#060)
+
+## 1.4.1
+
+### Bugfix
+- Fix: multiple SSL certificates are configured, but only one certificate working fine. [1818](https://github.com/apache/incubator-apisix/pull/1818)
+
+
## 1.4.0
### Core
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index d64e260..3a9e844 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -19,6 +19,7 @@
# Table of Contents
+- [1.4.1](#141)
- [1.4.0](#140)
- [1.3.0](#130)
- [1.2.0](#120)
@@ -29,6 +30,11 @@
- [0.7.0](#070)
- [0.6.0](#060)
+## 1.4.1
+
+### Bugfix
+- 修复在配置了多个 SSL 证书的情况下，只有一个证书生效的问题。 [1818](https://github.com/apache/incubator-apisix/pull/1818)
+
## 1.4.0
### Core
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index fee7a8f..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache APISIX (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-Incubation is required of all newly accepted projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the completeness or stability of the code,
-it does indicate that the project has yet to be fully endorsed by the ASF.
diff --git a/NOTICE b/NOTICE
index e15bb45..8690119 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache APISIX (incubating)
+Apache APISIX
Copyright 2019-2020 The Apache Software Foundation
This product includes software developed at
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index c3606c2..5c2ffdc 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -15,5 +15,6 @@
-- limitations under the License.
--
return {
- VERSION = "1.4"
+
+ VERSION = "1.4.1"
}
diff --git a/doc/how-to-build.md b/doc/how-to-build.md
index b1a276e..157baa3 100644
--- a/doc/how-to-build.md
+++ b/doc/how-to-build.md
@@ -34,21 +34,21 @@ You can install Apache APISIX in a variety of ways, including source code packag
You need to download the Apache source release first:
```shell
-wget http://www.apache.org/dist/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz
-tar zxvf apache-apisix-1.4-incubating-src.tar.gz
+wget http://www.apache.org/dist/apisix/1.4.1/apache-apisix-1.4.1-src.tar.gz
+tar zxvf apache-apisix-1.4.1-src.tar.gz
```
Install the Lua libraries that the runtime depends on:
```shell
-cd apache-apisix-1.4-incubating
+cd apache-apisix-1.4.1
make deps
```
### Installation via RPM package (CentOS 7)
```shell
-sudo yum install -y https://github.com/apache/incubator-apisix/releases/download/1.4/apisix-1.4-0.el7.noarch.rpm
+sudo yum install -y https://github.com/apache/incubator-apisix/releases/download/1.4.1/apisix-1.4.1-0.el7.noarch.rpm
```
### Installation via Luarocks (macOS not supported)
@@ -64,11 +64,11 @@ sudo sh -c "$(curl -fsSL https://raw.githubusercontent.com/apache/incubator-apis
> Install the specified version via Luarocks:
```shell
-# Install version 1.4
-sudo luarocks install --lua-dir=/path/openresty/luajit apisix 1.4
+# Install version 1.4.1
+sudo luarocks install --lua-dir=/path/openresty/luajit apisix 1.4.1
# old luarocks not support the `lua-dir` parameter, you can remove this option
-sudo luarocks install apisix 1.4
+sudo luarocks install apisix 1.4.1
```
## 3. Manage (start/stop) APISIX Server
diff --git a/doc/zh-cn/how-to-build.md b/doc/zh-cn/how-to-build.md
index 303dcd6..56a1c18 100644
--- a/doc/zh-cn/how-to-build.md
+++ b/doc/zh-cn/how-to-build.md
@@ -34,20 +34,20 @@ Apache APISIX 的运行环境需要 Nginx 和 etcd，
你需要先下载 Apache Release 源码包：
```shell
-wget http://www.apache.org/dist/incubator/apisix/1.4/apache-apisix-1.4-incubating-src.tar.gz
-tar zxvf apache-apisix-1.4-incubating-src.tar.gz
+wget http://www.apache.org/dist/apisix/1.4.1/apache-apisix-1.4.1-src.tar.gz
+tar zxvf apache-apisix-1.4.1-src.tar.gz
```
安装运行时依赖的 Lua 库：
```
-cd apache-apisix-1.4-incubating
+cd apache-apisix-1.4.1
make deps
```
### 通过 RPM 包安装（CentOS 7）
```shell
-sudo yum install -y https://github.com/apache/incubator-apisix/releases/download/1.4/apisix-1.4-0.el7.noarch.rpm
+sudo yum install -y https://github.com/apache/incubator-apisix/releases/download/1.4.1/apisix-1.4.1-0.el7.noarch.rpm
```
### 通过 Luarocks 安装 （不支持 macOS）
@@ -63,11 +63,11 @@ sudo sh -c "$(curl -fsSL https://raw.githubusercontent.com/apache/incubator-apis
> 通过 Luarocks 安装指定的版本:
```shell
-# 安装 apisix 的 1.4 版本
-sudo luarocks install --lua-dir=/path/openresty/luajit apisix 1.4
+# 安装 apisix 的 1.4.1 版本
+sudo luarocks install --lua-dir=/path/openresty/luajit apisix 1.4.1
# 老版本 luarocks 可能不支持 `lua-dir` 参数，可以删除该选项
-sudo luarocks install apisix 1.4
+sudo luarocks install apisix 1.4.1
```
## 3. 管理（启动、关闭等）APISIX 服务
diff --git a/rockspec/apisix-0.9-0.rockspec b/rockspec/apisix-0.9-0.rockspec
index 28952bb..94c7962 100644
--- a/rockspec/apisix-0.9-0.rockspec
+++ b/rockspec/apisix-0.9-0.rockspec
@@ -24,7 +24,7 @@ source = {
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}
diff --git a/rockspec/apisix-1.0-0.rockspec b/rockspec/apisix-1.0-0.rockspec
index 5e4f401..0a97198 100644
--- a/rockspec/apisix-1.0-0.rockspec
+++ b/rockspec/apisix-1.0-0.rockspec
@@ -24,7 +24,7 @@ source = {
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}
diff --git a/rockspec/apisix-1.1-0.rockspec b/rockspec/apisix-1.1-0.rockspec
index f194026..1add562 100644
--- a/rockspec/apisix-1.1-0.rockspec
+++ b/rockspec/apisix-1.1-0.rockspec
@@ -24,7 +24,7 @@ source = {
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}
diff --git a/rockspec/apisix-1.2-0.rockspec b/rockspec/apisix-1.2-0.rockspec
index 1a6ad32..e57a61d 100644
--- a/rockspec/apisix-1.2-0.rockspec
+++ b/rockspec/apisix-1.2-0.rockspec
@@ -24,7 +24,7 @@ source = {
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}
diff --git a/rockspec/apisix-1.3-0.rockspec b/rockspec/apisix-1.3-0.rockspec
index 99dddc5..580bf48 100644
--- a/rockspec/apisix-1.3-0.rockspec
+++ b/rockspec/apisix-1.3-0.rockspec
@@ -24,7 +24,7 @@ source = {
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}
diff --git a/rockspec/apisix-1.4-0.rockspec b/rockspec/apisix-1.4-0.rockspec
index f9bb44d..f0f8242 100644
--- a/rockspec/apisix-1.4-0.rockspec
+++ b/rockspec/apisix-1.4-0.rockspec
@@ -21,11 +21,11 @@ supported_platforms = {"linux", "macosx"}
source = {
url = "git://github.com/apache/incubator-apisix",
- tag = "1.4",
+ branch = "1.4",
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}
diff --git a/rockspec/apisix-1.4-0.rockspec b/rockspec/apisix-1.4.1-0.rockspec
similarity index 90%
copy from rockspec/apisix-1.4-0.rockspec
copy to rockspec/apisix-1.4.1-0.rockspec
index f9bb44d..3fc6ea4 100644
--- a/rockspec/apisix-1.4-0.rockspec
+++ b/rockspec/apisix-1.4.1-0.rockspec
@@ -16,16 +16,16 @@
--
package = "apisix"
-version = "1.4-0"
+version = "1.4.1-0"
supported_platforms = {"linux", "macosx"}
source = {
url = "git://github.com/apache/incubator-apisix",
- tag = "1.4",
+ branch = "1.4.1",
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}
diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
index 01c17d6..9261b21 100644
--- a/rockspec/apisix-master-0.rockspec
+++ b/rockspec/apisix-master-0.rockspec
@@ -25,7 +25,7 @@ source = {
}
description = {
- summary = "Apache APISIX(incubating) is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.",
+ 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/incubator-apisix",
license = "Apache License 2.0",
}