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

Clarify consul ssl connectivity #1773

Closed
wants to merge 2 commits into from
Closed

Conversation

bitsofinfo
Copy link
Contributor

Clarify consul ssl connectivity for #1718

document change to clarify consul ssl, vs consul ssl client certificate security
traefik#1718
@ldez
Copy link
Member

ldez commented Jun 20, 2017

Thanks for the contribution.

I will close, this PR contains a wrong commit because you have re-used your previous branch.

Please create a new PR 😃 .

In the following commands, I suppose your git local repository setup is:

$ git remote -v

origin	git@github.com:bitsofinfo/traefik.git (fetch)
origin	git@github.com:bitsofinfo/traefik.git (push)
upstream	git@github.com:containous/traefik.git (fetch)
upstream	git@github.com:containous/traefik.git (push)

The commands:

# Update all remotes
git fetch --all

# Go to current master
git checkout master

# Backup previous branch
git branch temp

# Reset and update your master branch
git reset --hard upstream/master
git push -f origin master

# Create a new branch
git checkout -b doc-consul-ssl

# add the good commit on this new branch
git cherry-pick f8855186

# Push
git push origin doc-consul-ssl

# Delete backup
git branch -D temp

 # Create a new PR with the branch: doc-consul-ssl

For the next time, create a dedicate branch for each PR 😉 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants