Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

fix: support HTTP and HTTPS mixture for DM-master config items #1217

Merged
merged 2 commits into from
Oct 26, 2020
Merged

fix: support HTTP and HTTPS mixture for DM-master config items #1217

merged 2 commits into from
Oct 26, 2020

Conversation

csuzhangxc
Copy link
Member

What problem does this PR solve?

fix TOOL-2172 (internal only).

some users may forget to update URL config items from http to https and with TLS enabled.

What is changed and how it works?

always update scheme based on whether TLS enabled.

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has exported variable/fields change

Side effects

Related changes

  • Need to cherry-pick to the release branch

@csuzhangxc csuzhangxc added priority/normal Minor change, requires approval from ≥1 primary reviewer status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Oct 26, 2020
@csuzhangxc csuzhangxc added this to the v2.0.0 milestone Oct 26, 2020
@lance6716
Copy link
Collaborator

LGTM

@ti-srebot ti-srebot added the status/LGT1 One reviewer already commented LGTM label Oct 26, 2020
GMHDBJD
GMHDBJD approved these changes Oct 26, 2020
View reviewed changes
Copy link
Collaborator

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@GMHDBJD GMHDBJD added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Oct 26, 2020
@csuzhangxc csuzhangxc merged commit e6d024f into pingcap:master Oct 26, 2020
@csuzhangxc csuzhangxc deleted the fix-master-https branch October 26, 2020 10:26
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Oct 26, 2020
@csuzhangxc @ti-srebot
cherry pick pingcap#1217 to release-2.0
08c2db7 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Oct 26, 2020
Merged
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1220

@ti-srebot ti-srebot added already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Oct 26, 2020
lance6716 pushed a commit that referenced this pull request Oct 27, 2020
@ti-srebot
cherry pick #1217 to release-2.0 (#1220)
734ac43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees
No one assigned
Labels
already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked priority/normal Minor change, requires approval from ≥1 primary reviewer status/LGT2 Two reviewers already commented LGTM, ready for merge status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@csuzhangxc @lance6716 @ti-srebot @GMHDBJD