Merge pull request #2910 from normal-wls/begin_3.6.19

minor: 3.6.19 begin
TencentBlueKing · Oct 27, 2020 · ffc5b60 · ffc5b60
2 parents df43cd2 + b71303c
commit ffc5b60
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 4 deletions.
diff --git a/app.yml b/app.yml
@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.6.18
+version: 3.6.19
 category: 运维工具
 language_support: 中文
 desktop:

diff --git a/config/default.py b/config/default.py
@@ -147,7 +147,7 @@
 # Django模板中：<script src="/a.js?v="></script>
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
-STATIC_VERSION = "3.6.18"
+STATIC_VERSION = "3.6.19"
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
 

diff --git a/dev_log/dev/fannluo_202010261613.yaml → dev_log/3.6.19/fannluo_202010261613.yaml b/dev_log/dev/fannluo_202010261613.yaml → dev_log/3.6.19/fannluo_202010261613.yaml
diff --git a/dev_log/dev/fannluo_202010261730.yaml → dev_log/3.6.19/fannluo_202010261730.yaml b/dev_log/dev/fannluo_202010261730.yaml → dev_log/3.6.19/fannluo_202010261730.yaml
diff --git a/dev_log/dev/fannluo_202010262035.yaml → dev_log/3.6.19/fannluo_202010262035.yaml b/dev_log/dev/fannluo_202010262035.yaml → dev_log/3.6.19/fannluo_202010262035.yaml
diff --git a/dev_log/dev/normal-wls_2020102262210.yaml → dev_log/3.6.19/normal-wls_2020102262210.yaml b/dev_log/dev/normal-wls_2020102262210.yaml → dev_log/3.6.19/normal-wls_2020102262210.yaml
diff --git a/dev_log/dev/normal-wls_202010261725.yaml → dev_log/3.6.19/normal-wls_202010261725.yaml b/dev_log/dev/normal-wls_202010261725.yaml → dev_log/3.6.19/normal-wls_202010261725.yaml
diff --git a/docs/release.md b/docs/release.md
@@ -1,5 +1,18 @@
 # Release
 
+## 3.6.19
+
+- feature
+  - 增加 healthz 接口
+- bugfix
+  - 下拉框tag设置为多选勾选为变量后，表单值不显示变量key修复
+  - 集群资源筛选变量主机数量手动输入数字不生效问题修复
+  - 修复 项目管理页面无法进行搜索 问题
+  - 修复 故障机替换 插件 bk_host_innerip KeyError 问题，增加是否复制故障机属性选项
+- improvement
+  - 输入参数勾选为全局变量复用逻辑调整
+  - 集群资源筛选变量支持筛选业务下配置的自定义集群属性和不可编辑的集群属性
+
 ## 3.6.18
 
 - bugfix

diff --git a/readme.md b/readme.md
@@ -1,7 +1,7 @@
 ![](docs/resource/img/logo_zh.png)
 ---
 [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/Tencent/bk-sops/blob/master/LICENSE)
-[![Release](https://img.shields.io/badge/release-3.6.18-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
+[![Release](https://img.shields.io/badge/release-3.6.19-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
 [![travis-ci](https://travis-ci.com/Tencent/bk-sops.svg?branch=master)](https://travis-ci.com/Tencent/bk-sops)
 [![Coverage Status](https://codecov.io/gh/Tencent/bk-sops/branch/master/graph/badge.svg)](https://codecov.io/gh/Tencent/bk-sops)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-sops/pulls)

diff --git a/readme_en.md b/readme_en.md
@@ -1,7 +1,7 @@
 ![](docs/resource/img/logo_en.png)
 ---
 [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/Tencent/bk-sops/blob/master/LICENSE)
-[![Release](https://img.shields.io/badge/release-3.6.18-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
+[![Release](https://img.shields.io/badge/release-3.6.19-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
 [![travis-ci](https://travis-ci.com/Tencent/bk-sops.svg?branch=master)](https://travis-ci.com/Tencent/bk-sops)
 [![Coverage Status](https://codecov.io/gh/Tencent/bk-sops/branch/master/graph/badge.svg)](https://codecov.io/gh/Tencent/bk-sops)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-sops/pulls)

diff --git a/version_log/version_logs_md/V3.6.19_2020-10-27.md b/version_log/version_logs_md/V3.6.19_2020-10-27.md
@@ -0,0 +1,11 @@
+
+## feature
+  - 增加 healthz 接口
+## bugfix
+  - 下拉框tag设置为多选勾选为变量后，表单值不显示变量key修复
+  - 集群资源筛选变量主机数量手动输入数字不生效问题修复
+  - 修复 项目管理页面无法进行搜索 问题
+  - 修复 故障机替换 插件 bk_host_innerip KeyError 问题，增加是否复制故障机属性选项
+## improvement
+  - 输入参数勾选为全局变量复用逻辑调整
+  - 集群资源筛选变量支持筛选业务下配置的自定义集群属性和不可编辑的集群属性