Hotfix release master #7594
Merged
Hotfix release master #7594
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ntBlueKing/bk-sops into hotfix_release_master # Conflicts: # gcloud/tests/utils/cmdb/test_business_host_topo.py # gcloud/utils/cmdb.py # pipeline_plugins/cmdb_ip_picker/query.py
normal-wls
requested changes
Oct 29, 2024
| @@ -219,7 +219,10 @@ def cmdb_search_host(request, bk_biz_id, bk_supplier_account="", bk_supplier_id= | |||
| host_lock_status = host_lock_status_data.get(host_detail["bk_host_id"]) | |||
| if host_lock_status is not None: | |||
| host_detail["bk_host_lock_status"] = host_lock_status | |||
| result = {"result": True, "code": NO_ERROR, "data": data} | |||
| if count: | |||
| result = {"result": True, "code": NO_ERROR, "data": {"data": data, "count": count}} | |||
normal-wls
requested changes
Oct 30, 2024
guohelu
force-pushed
the
hotfix_release_master
branch
from
e46b431
to
ad1bcbf
Compare
guohelu
force-pushed
the
hotfix_release_master
branch
from
dae64e6
to
bedd6cd
Compare
normal-wls
requested changes
Oct 31, 2024
normal-wls
approved these changes
Oct 31, 2024
normal-wls
merged commit d0c7abd
into
TencentBlueKing:feature_ip_selector_master
6 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.