toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the stream formatter to display custom unit numbers.

Browse Source 
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: a771c16834c92cb39142078c64e253423f0fb4e3
Component: engine
This commit is contained in:
Ying Li
2017-05-11 11:13:11 -07:00
parent dbf4ba7522
commit 59422fa37f
5 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/cluster/convert/swarm.go
+1 -1
View File
@@ -123,7 +123,7 @@ func MergeSwarmSpecToGRPC(s types.Spec, spec swarmapi.ClusterSpec) (swarmapi.Clu
spec.CAConfig.SigningCACert = []byte(s.CAConfig.SigningCACert)
}
if s.CAConfig.SigningCAKey != "" {
// do prpagate the signing CA key here because we want to provide it TO the swarm APIs
// do propagate the signing CA key here because we want to provide it TO the swarm APIs
spec.CAConfig.SigningCAKey = []byte(s.CAConfig.SigningCAKey)
}
spec.CAConfig.ForceRotate = s.CAConfig.ForceRotate