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

Add support for host keys for non-22 ports (v2.1) #8140

Merged
merged 1 commit into from
Nov 18, 2020
Merged

Add support for host keys for non-22 ports (v2.1) #8140

merged 1 commit into from
Nov 18, 2020

Conversation

afbjorklund
Copy link
Contributor

@afbjorklund afbjorklund commented Oct 25, 2020 •
edited
Loading

For #8139

Patch against release version (2.1.1), can be rebased against master.

@afbjorklund
Add support for host keys for non-22 ports
8794e8d 
When not using the standard SSH port (22), the port is appended
to the hostname (in brackets) like so: "host" -> "[host]:1234"

Signed-off-by: Anders F Björklund <[email protected]>
@mheon
Copy link
Member

mheon commented Oct 25, 2020

Master is probably better if you can wait a week or so - we're going to start cutting RCs for 2.2 this week, release hopefully early next week.

@afbjorklund
Copy link
Contributor Author

Master is probably better if you can wait a week or so - we're going to start cutting RCs for 2.2 this week, release hopefully early next week.

No problem, can do a rebase in a PR (just that 2.1.1 was the one that I tested with...)

@afbjorklund afbjorklund mentioned this pull request Oct 25, 2020
Merged
@afbjorklund
Copy link
Contributor Author

Seems like the "merge conflicts" were only in the version files anyway

@afbjorklund afbjorklund changed the title Add support for host keys for non-22 ports Add support for host keys for non-22 ports (v2.1) Oct 25, 2020
@rhatdan
Copy link
Member

rhatdan commented Nov 18, 2020

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 18, 2020
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 18, 2020
@openshift-merge-robot openshift-merge-robot merged commit 9d8a948 into containers:v2.1 Nov 18, 2020
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@rhatdan rhatdan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@afbjorklund @mheon @rhatdan @openshift-ci-robot @openshift-merge-robot