diff --git a/.requirements b/.requirements index ebf9ef2ab67e..9e96f5679438 100644 --- a/.requirements +++ b/.requirements @@ -18,4 +18,4 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.2 -APISIX_DASHBOARD_COMMIT=70712bd33f55f7979d4cb73a898e9778e0fbfe8b +APISIX_DASHBOARD_COMMIT=39be363cdbc5395d3163572c532be95f3dbad03a diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a3aa5acef6e..36d3c66e1595 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ title: Changelog ## Table of Contents +- [3.14.1](#3141) - [3.14.0](#3140) - [3.13.0](#3130) - [3.12.0](#3120) @@ -81,6 +82,21 @@ title: Changelog - [0.7.0](#070) - [0.6.0](#060) +## 3.14.1 + +### Bugfixes + +- fix: port conflict in worker process for prometheus port [#12667](https://github.com/apache/apisix/pull/12667) + +### Core + +- fix: add warning log when skipping check for disabled plugin [#12655](https://github.com/apache/apisix/pull/12655) +- chore: add test for verifying lua-resty-openssl bug fix [#12656](https://github.com/apache/apisix/pull/12656) + +## Doc improvements + +- docs: remove unnecessary sentence in opentelemetry plugin doc [#12660](https://github.com/apache/apisix/pull/12660) + ## 3.14.0 **The changes marked with :warning: are not backward compatible.** diff --git a/apisix/core/version.lua b/apisix/core/version.lua index 42ed228e92aa..db47f95cbb7a 100644 --- a/apisix/core/version.lua +++ b/apisix/core/version.lua @@ -20,5 +20,5 @@ -- @module core.version return { - VERSION = "3.14.0" + VERSION = "3.14.1" } diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json index bee266f04d63..7052adca4b13 100644 --- a/docs/en/latest/config.json +++ b/docs/en/latest/config.json @@ -1,5 +1,5 @@ { - "version": "3.14.0", + "version": "3.14.1", "sidebar": [ { "type": "category", diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json index c0489e6415de..2e48f06532a6 100644 --- a/docs/zh/latest/config.json +++ b/docs/zh/latest/config.json @@ -1,5 +1,5 @@ { - "version": "3.14.0", + "version": "3.14.1", "sidebar": [ { "type": "category",