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 Conflict Resolution (from 5.4.x to 5.5.x) #2285

Merged
merged 2 commits into from May 17, 2022
Merged

Merge Conflict Resolution (from 5.4.x to 5.5.x) #2285

merged 2 commits into from May 17, 2022

Conversation

ConfluentJenkins
Copy link
Collaborator

What is this pull request?

This is an autogenerated pull request by pint due to a merge conflict failure seen during pint merge.

Next Steps

  1. Resolve all conflicts (either via web editor or the command line)
  2. Commit merge
  3. Obtain approvals from reviewers
  4. (IMPORTANT) After obtaining approvals, click the dropdown menu on the merge button and select "Create a merge commit"
  5. Click the "Merge pull request" button
  6. Re-run pint merge

NOTE: "Create a merge commit" option must be used to ensure all commits from the head branch is added to the base branch.

Questions?

Please reach out to the Developer Productivity team on Slack at #devprod-eng or #devprod-oncall

rayokota
rayokota approved these changes May 17, 2022
View reviewed changes
Copy link
Member

@rayokota rayokota left a comment

Choose a reason for hiding this comment

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

LGTM

@Anshul-Goyal Anshul-Goyal merged commit e12799a into 5.5.x May 17, 2022
@Anshul-Goyal Anshul-Goyal deleted the pr_merge_from_5_4_x_to_5_5_x branch May 17, 2022 16:48
Anshul-Goyal added a commit that referenced this pull request May 17, 2022
@ConfluentJenkins @Anshul-Goyal @im-pratham
Disable endpoint verification for schema registry client (#2284) (#2285…
914dd31 
…) (#2287)

Co-authored-by: Prathamesh <prathameshmane1234@gmail.com>

Co-authored-by: Anshul Goyal <agoyal@confluent.io>
Co-authored-by: Prathamesh <prathameshmane1234@gmail.com>

Co-authored-by: Anshul Goyal <agoyal@confluent.io>
Co-authored-by: Prathamesh <prathameshmane1234@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rayokota rayokota rayokota approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ConfluentJenkins @rayokota @Anshul-Goyal