Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge: master->3.6.x #1396

Merged
merged 69 commits into from
Sep 27, 2022
Merged

Merge: master->3.6.x #1396

merged 69 commits into from
Sep 27, 2022

Conversation

jsonwan
Copy link
Collaborator

@jsonwan jsonwan commented Sep 27, 2022

No description provided.

wangyu096 and others added 30 commits September 2, 2022 17:46
@wangyu096
bugfix: 执行详情，根据ip过滤主机，每个结果分组上显示的主机总数错误 #1247
19a2728
@wangyu096
Merge branch 'master' of https://github.com/Tencent/bk-job into featu…
5f0e6e4 
…re/rolling
@jsonwan
Merge pull request #1248 from wangyu096/feature/rolling
4516f8b 
bugfix: 执行详情，根据ip过滤主机，每个结果分组上显示的主机总数错误 #1247
@wangyu096
feature: 滚动执行新增DB表的数据归档 #1196
a446337 
修改归档任务的分布式锁过期时间为24h
@wangyu096
feature: 滚动执行新增DB表的数据归档 #1196
182d044 
计算归档的task_instance_id/step_instance_id优化
@wangyu096
Merge branch 'master' of https://github.com/Tencent/bk-job into featu…
5a59694 
…re/rolling
@wangyu096
Merge pull request #1250 from wangyu096/feature/rolling
5acc165 
feature: 滚动执行新增DB表的数据归档 #1196
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
640caf1
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
f21fc86
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
964bf90
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
7d54be5
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
6a2fb57
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
1b5a2f9
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
057d46e
@jsonwan
Merge pull request #1252 from wangyu096/feature/rolling
64338a5 
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
@wangyu096
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
e53d1e9
@wangyu096
Merge pull request #1253 from wangyu096/feature/rolling
a7bfb47 
bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
@jsonwan
Merge pull request #1261 from Tencent/3.6.x
a05cc20 
Merge: 3.6.x->master
@jsonwan
Merge pull request #1265 from Tencent/3.6.x
b221f62 
Merge: 3.6.x->master
@hLinx
Merge pull request #1270 from hLinx/3.5.x
fa5580d 
3.5.x
@jsonwan
Merge branch '3.6.x' into github_master
7918897
@jsonwan
Merge pull request #1274 from jsonwan/master
03d455f 
Merge: 3.6.x->master
@hLinx
Merge pull request #1277 from hLinx/3.5.x
e4c0266 
bugfix: 作业模板和执行方案对“必填”字段的命名没有统一 #1219
@wangyu096
bugfix: esb push_config_file API 调用，源主机IP不应该校验 #1281
cdc9212
@wangyu096
bugfix: esb push_config_file API 调用，源主机IP不应该校验 #1281
f7db30a
@jsonwan
Merge pull request #1282 from wangyu096/feature/rolling
062359a 
bugfix: esb push_config_file API 调用，源主机IP不应该校验 #1281
@wangyu096
perf: job获取脚本列表接口响应慢 #1205
68c7b5e
@wangyu096
Merge branch 'master' of https://github.com/Tencent/bk-job into featu…
1758a92 
…re/rolling
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
a5e586f 
使用纯SDK
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
bc00c42 
线程池创建使用Spring Bean
jsonwan and others added 26 commits September 14, 2022 17:44
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
734a28e 
移除javaagent
@wangyu096
perf: job获取脚本列表接口响应慢 #1205
540101b
@jsonwan
Merge pull request #1284 from wangyu096/feature/rolling
f2993a1 
perf: job获取脚本列表接口响应慢 #1205
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
cb650ea 
代码优化
@wangyu096
Merge pull request #1283 from jsonwan/github_perf/apm
7295760 
perf: 接入蓝鲸监控APM调用链追踪 #1161
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
f89cdc8 
修复集成测试
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
08736a9 
修复集成测试
@wangyu096
Merge pull request #1288 from jsonwan/github_perf/apm
5c90556 
perf: 接入蓝鲸监控APM调用链追踪 #1161
@hLinx
Merge pull request #1290 from hLinx/3.5.x
6d596e7 
3.5.x
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
92dbdee 
支持JDBC调用MySQL追踪
@jsonwan
perf: 接入蓝鲸监控APM调用链追踪 #1161
f683f66 
容器化配置调整
@wangyu096
Merge pull request #1292 from jsonwan/github_perf/apm
475018f 
perf: 接入蓝鲸监控APM调用链追踪 #1161
@hLinx
Merge pull request #1352 from hLinx/3.6.x
77bc60c 
3.6.x
@hLinx
Merge pull request #1355 from hLinx/3.5.x
c074d1b 
perf: 快速执行的任务历史，不应该显示：步骤执行详情，应该显示：快速执行详情，现在会误以为是作业步骤 #1299
@jsonwan
Merge pull request #1356 from Tencent/3.5.x
7311506 
Merge: 3.5.x->master
@jsonwan
Merge pull request #1358 from Tencent/3.5.x
f9cfed7 
Merge: 3.5.x->master
@jsonwan
Merge pull request #1361 from Tencent/3.5.x
e0e2cdd 
Merge: 3.5.x->master
@hLinx
Merge pull request #1365 from hLinx/3.5.x
f9a404c 
bugfix: 已上线的脚本，为啥还提示未保存的内容 #1307
@jsonwan
chore: 添加Stream CI开源扫描配置 #1366
9858f5e
@wangyu096
Merge pull request #1367 from jsonwan/github_chore/add_codecc_check
9c1472c 
chore: 添加Stream CI开源扫描配置 #1366
@hLinx
Merge pull request #1373 from hLinx/3.5.x
3281767 
3.5.x
@hLinx
Merge pull request #1378 from hLinx/3.5.x
893b1c2 
3.5.x
@hLinx
Merge pull request #1381 from hLinx/3.5.x
ae52e76 
feature: 文件上传本地文件上传后缀调整 #1375
@hLinx
Merge pull request #1388 from hLinx/3.5.x
5ade582 
bugfix: 选用“业务脚本”或“公共脚本”时匹配中高危语句的交互，要和手工输入的保持一致 #1294
@hLinx
Merge pull request #1392 from hLinx/3.5.x
5cd0c76 
3.5.x
@jsonwan
Merge pull request #1394 from Tencent/3.6.x
2ef75f2 
Merge: 3.6.x->master
@jsonwan jsonwan merged commit 1ca774e into 3.6.x Sep 27, 2022
hLinx added a commit to hLinx/bk-job that referenced this pull request Oct 13, 2023
@hLinx
fix: 公共脚本新增版本保存报错 TencentBlueKing#1396
1ec4ccf
hLinx added a commit that referenced this pull request Oct 13, 2023
@hLinx
Merge pull request #2517 from hLinx/hotfix_master
86e8e0f 
fix: 公共脚本新增版本保存报错 #1396
@bkjob-bot bkjob-bot added the done 已上线到正式环境并验收通过 label Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
done 已上线到正式环境并验收通过
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jsonwan @bkjob-bot @wangyu096 @hLinx