Merge pull request #26501 from mstanleyjones/revert_26455

Revert commit of #26236 to 1.12.x branch
This commit is contained in:
Misty Stanley-Jones 2016-09-12 11:16:34 -07:00 committed by GitHub
commit 7e9c951813

View file

@ -26,7 +26,7 @@ Options:
--config=~/.docker Location of client config files
-D, --debug Enable debug mode
-H, --host=[] Daemon socket(s) to connect to
--help Print usage
-h, --help Print usage
-l, --log-level=info Set the logging level
--tls Use TLS; implied by --tlsverify
--tlscacert=~/.docker/ca.pem Trust certs signed only by this CA