This is an automated email from the ASF dual-hosted git repository.
wenming pushed a commit to branch v2.1
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/v2.1 by this push:
new 9da476a fix
9da476a is described below
commit 9da476a7ce71dc072f7071521a9f3df3e43c27cd
Author: WenMing <moonbingb...@gmail.com>
AuthorDate: Wed Nov 25 14:03:35 2020 +0800
fix
---
CHANGELOG.md | 4 +++-
CHANGELOG_CN.md | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1d2ca4..1ea686e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,8 @@
- :sunrise: **support TLS connection with etcd.**
[#2548](https://github.com/apache/apisix/pull/2548)
- generate create/update_time automatically.
[#2740](https://github.com/apache/apisix/pull/2740)
- add a deprecate log for enable_websocket in
upstream.[#2691](https://github.com/apache/apisix/pull/2691)
-- refactor(consumer): remove id and use username only, which is not backward
compatible. Consumers in the previous version need to manually clean up the id
field in etcd, otherwise the schema check will report an error when used.
[#2679](https://github.com/apache/apisix/pull/2679)
+-Incompatibility notice: In the next release, the consumer will only support
user name and discard the id. The consumer needs to manually clear the id field
in etcd, otherwise the schema verification will report an error during use.
[#2829](https://github.com/apache/apisix/pull/2829)
+-Incompatibility notice: In the next release, enable websocket on upstream
will no longer be supported. [#2836](https://github.com/apache/apisix/pull/2836)
## Plugin
- :sunrise: **Upgrade protocol to support Apache Skywalking
8.0**[#2389](https://github.com/apache/apisix/pull/2389). So this version only
supports skywalking 8.0 protocol. This plugin is disabled by default, you need
to modify config.yaml to enable, which is not backward compatible.
@@ -50,6 +51,7 @@
## Bugfix
- :bug: fix(etcd): handle etcd
compaction.[#2687](https://github.com/apache/apisix/pull/2687)
- fix: move `conf/cert` to `t/certs` and disable ssl by default, which is not
backward compatible. [#2112](https://github.com/apache/apisix/pull/2112)
+- fix: check decrypt key to prevent lua thread aborted
[#2815](https://github.com/apache/apisix/pull/2815)
For more changes, please refer to
[Milestone](https://github.com/apache/apisix/milestone/8)
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index 81034d1..d7c8e15 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -41,7 +41,8 @@
- :sunrise: **支持使用 TLS 来连接 etcd.**
[#2548](https://github.com/apache/apisix/pull/2548)
- 自动生成对象的创建和更新时间. [#2740](https://github.com/apache/apisix/pull/2740)
- 在上游中开启 websocket
时，增加日志来提示此功能废弃.[#2691](https://github.com/apache/apisix/pull/2691)
-- consumer 中只支持用户名，移除 id，这是不向下兼容的修改。之前版本中的consumer需要在 etcd 中手工清理掉 id 字段，不然使用时
schema 校验会报错。[#2679](https://github.com/apache/apisix/pull/2679)
+- 不向下兼容预告：在下一个发布版本中，consumer 将只支持用户名，废弃 id，consumer需要在 etcd 中手工清理掉 id 字段，不然使用时
schema 校验会报错。[#2829](https://github.com/apache/apisix/pull/2829)
+- 不向下兼容预告：在下一个发布版本中，将不再支持在 upstream 上开启
websocket。[#2836](https://github.com/apache/apisix/pull/2836)
## Plugin
- :sunrise: **升级协议来 Apache Skywalking
8.0**[#2389](https://github.com/apache/apisix/pull/2389). 这个版本只支持 skywalking
8.0 协议。此插件默认关闭，需要修改 config.yaml 来开启。这是不向下兼容的修改。
@@ -51,6 +52,7 @@
## Bugfix
- :bug: fix(etcd): 处理 etcd
compaction.[#2687](https://github.com/apache/apisix/pull/2687)
- 将 `conf/cert` 中的测试证书移动到 `t/certs` 目录中，并且默认关闭 SSL。这是不向下兼容的修改。
[#2112](https://github.com/apache/apisix/pull/2112)
+- 检查 decrypt key 来阻止 lua thread 中断。
[#2815](https://github.com/apache/apisix/pull/2815)
更多的变动可以参考[里程碑](https://github.com/apache/apisix/milestone/8)
