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.

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

Only append the UserKnownHostsFile ssh flag when required #4674

Merged
merged 1 commit into from
Jun 1, 2018

Conversation

Crazybus
Copy link
Contributor

@Crazybus Crazybus commented Jun 1, 2018

Don't set a default value for the UserKnownHostsFile flag.
Only append -o UserKnownHostsFile to the ssh command if it has been specified by the user or vault ssh has set it based on another flag (such as flagHostKeyMountPoint)

Fixes #4672

@jefferai jefferai added this to the 0.10.2 milestone Jun 1, 2018
@Crazybus
Copy link
Contributor Author

Crazybus commented Jun 1, 2018

The merge conflicts were caused by my other PR #4673 I'll fix them up and rebase.

Don't set a default value for the UserKnownHostsFile flag.
Only append `-o UserKnownHostsFile` to the ssh command if it
has been specified by the user or vault ssh has set it based on another
flag (such as flagHostKeyMountPoint)

Fixes hashicorp#4672
@Crazybus
Copy link
Contributor Author

Crazybus commented Jun 1, 2018

@jefferai merge conflict has been resolved.

Copy link
Member

@jefferai jefferai left a comment

Choose a reason for hiding this comment

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

Looks great, thanks!

@jefferai jefferai merged commit 7090348 into hashicorp:master Jun 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants