summaryrefslogtreecommitdiff
path: root/vendor/github.com/fsouza/go-dockerclient/tls.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-13 10:14:09 -0700
committerGitHub <noreply@github.com>2019-03-13 10:14:09 -0700
commit1fa664166571ab7dd3abe1b0d64ae9a81a8688ae (patch)
treefc6b218409181bbe49c7c315bcba16ab160d49f4 /vendor/github.com/fsouza/go-dockerclient/tls.go
parent8b3f759800ebd6e53e0a807728ede633aa9bdb36 (diff)
parent8f418f1568b2735fdeea9a84afc354e1f8cbc94c (diff)
downloadpodman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.tar.gz
podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.tar.bz2
podman-1fa664166571ab7dd3abe1b0d64ae9a81a8688ae.zip
Merge pull request #2628 from TomSweeneyRedHat/dev/tsweeney/bigvendorbuildah2
Vendor docker/docker, fsouza and more #2
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/tls.go')
-rw-r--r--vendor/github.com/fsouza/go-dockerclient/tls.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/tls.go b/vendor/github.com/fsouza/go-dockerclient/tls.go
index bb5790b5f..5f0e2e31e 100644
--- a/vendor/github.com/fsouza/go-dockerclient/tls.go
+++ b/vendor/github.com/fsouza/go-dockerclient/tls.go
@@ -109,10 +109,10 @@ func copyTLSConfig(cfg *tls.Config) *tls.Config {
NameToCertificate: cfg.NameToCertificate,
NextProtos: cfg.NextProtos,
PreferServerCipherSuites: cfg.PreferServerCipherSuites,
- Rand: cfg.Rand,
- RootCAs: cfg.RootCAs,
- ServerName: cfg.ServerName,
- SessionTicketKey: cfg.SessionTicketKey,
- SessionTicketsDisabled: cfg.SessionTicketsDisabled,
+ Rand: cfg.Rand,
+ RootCAs: cfg.RootCAs,
+ ServerName: cfg.ServerName,
+ SessionTicketKey: cfg.SessionTicketKey,
+ SessionTicketsDisabled: cfg.SessionTicketsDisabled,
}
}