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 from master #86

Merged
merged 8 commits into from
Jul 1, 2023
Merged

merge from master #86

merged 8 commits into from
Jul 1, 2023

Conversation

zhu327
Copy link
Member

@zhu327 zhu327 commented Jul 1, 2023

No description provided.

wklken and others added 8 commits August 17, 2022 17:03
@wklken
Merge pull request #74 from TencentBlueKing/develop
798d51f 
v1.2.2
@wklken
feat: support custom_frontend_settings migrate (#76) (#77)
e17bdb2 
Co-authored-by: tianyizhu <[email protected]>
@1142163389 @yetlau111
更新证书 (#78)
a313b3a 
Co-authored-by: yetlau <[email protected]>
@zhu327
Merge pull request #81 from TencentBlueKing/develop
081c25f 
v1.3.1
@OrenZhang
feature: 支持使用expression筛选 (#82)
80f93b0 
* feature: 支持使用expression筛选

* test: 补充单元测试

* doc: 补充版本日志
@benero
feature: list_instance、search_instance 新增 action 返回 (#84)
2712efd 
* feature: list_instance、search_instance 新增 action 返回

* minor: 调整 github action python 依赖版本

Signed-off-by: bennychen <[email protected]>

---------

Signed-off-by: bennychen <[email protected]>
@alex-smile
set require cachetools>=3.1.1,<6.0 in setup.py (#83)
5295f94
@alex-smile
Fix iam migrator app (#85)
450e616 
* set require cachetools>=3.1.1,<6.0 in setup.py

* 将 bk_app_code/bk_app_secret 设置为 IAMMigrator 的实例属性

* 更新 release 信息及版本号
@zhu327 zhu327 merged commit fc34c75 into develop Jul 1, 2023
@tencentblueking-adm
Copy link

tencentblueking-adm commented Jul 1, 2023 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 6 committers have signed the CLA.

✅ wklken
✅ OrenZhang
✅ zhu327
✅ alex-smile
✅ benero
❌ 1142163389
You have signed the CLA already but the status is still pending? Let us recheck it.

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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@zhu327 @tencentblueking-adm @wklken @1142163389 @OrenZhang @benero @alex-smile