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

Alphabetize daemon config file options #367

Merged
merged 1 commit into from
Nov 1, 2016

Conversation

cavemandaveman
Copy link

Just what the title says, plus change to 4 space indentation instead of tabs.

joaofnfernandes pushed a commit to joaofnfernandes/docker.github.io that referenced this pull request Nov 1, 2016
This allows a user to add an existing public key to client bundles, this
is used where the CA is externally managed (e.g. verisign) and we do not
have the authority to sign certs.

Fixes docker#367

Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
Copy link

@johndmulhausen johndmulhausen left a comment

Choose a reason for hiding this comment

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

Edit, nvm, eyes playing tricks

@johndmulhausen
Copy link

Thanks, @cavemandaveman :)

@johndmulhausen johndmulhausen self-assigned this Nov 1, 2016
@johndmulhausen johndmulhausen merged commit 2a696ed into docker:master Nov 1, 2016
joaofnfernandes pushed a commit to joaofnfernandes/docker.github.io that referenced this pull request Nov 2, 2016
This allows a user to add an existing public key to client bundles, this
is used where the CA is externally managed (e.g. verisign) and we do not
have the authority to sign certs.

Fixes docker#367

Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
joaofnfernandes pushed a commit to joaofnfernandes/docker.github.io that referenced this pull request Nov 11, 2016
This allows a user to add an existing public key to client bundles, this
is used where the CA is externally managed (e.g. verisign) and we do not
have the authority to sign certs.

Fixes docker#367

Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
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