Skip to content

[Backport 2.16-maintenance] Pass NIX_SSHOPTS when checking for an ssh master connection.#8714

Merged
edolstra merged 2 commits into2.16-maintenancefrom
backport-8506-to-2.16-maintenance
Jul 20, 2023
Merged

[Backport 2.16-maintenance] Pass NIX_SSHOPTS when checking for an ssh master connection.#8714
edolstra merged 2 commits into2.16-maintenancefrom
backport-8506-to-2.16-maintenance

Conversation

@github-actions
Copy link

@github-actions github-actions bot commented Jul 18, 2023

Automatic backport to 2.16-maintenance, triggered by a label in #8506.

corngood added 2 commits July 18, 2023 13:48
@corngood @github-actions
Add test of explicit ssh control path in nix-copy test
ba0400f 
This highlights a problem caused by SSHMaster::isMasterRunning returning
false when NIX_SSHOPTS contains -oControlPath.

(cherry picked from commit 5454fdc)
@corngood @github-actions
Pass common ssh options in isMasterRunning
52ddb32 
(cherry picked from commit d5e1eb2)
@github-actions github-actions bot mentioned this pull request Jul 18, 2023
Merged
8 tasks
@roberth roberth closed this Jul 18, 2023
@roberth roberth reopened this Jul 18, 2023
@github-actions github-actions bot added the tests label Jul 18, 2023
@edolstra edolstra merged commit 24dd90e into 2.16-maintenance Jul 20, 2023
@edolstra edolstra deleted the backport-8506-to-2.16-maintenance branch March 29, 2024 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thufschmitt thufschmitt Awaiting requested review from thufschmitt

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

Assignees

No one assigned

Labels

tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@roberth @edolstra @corngood