From 79aa96fbb5168053f7f2df1e976ba9cfaf4b7f47 Mon Sep 17 00:00:00 2001
From: Daniel Hiltgen <daniel.hiltgen@docker.com>
Date: Mon, 5 Oct 2015 13:15:57 -0700
Subject: [PATCH] Sync with https://github.com/docker/libkv/pull/75

---
 discovery/kv/kv.go | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/discovery/kv/kv.go b/discovery/kv/kv.go
index 1fa877812a..ce33308381 100644
--- a/discovery/kv/kv.go
+++ b/discovery/kv/kv.go
@@ -76,13 +76,6 @@ func (s *Discovery) Initialize(uris string, heartbeat time.Duration, ttl time.Du
 			return err
 		}
 		config = &store.Config{
-			// Set ClientTLS to trigger https (bug in libkv/etcd)
-			ClientTLS: &store.ClientTLSConfig{
-				CACertFile: clusterOpts["kv.cacertfile"],
-				CertFile:   clusterOpts["kv.certfile"],
-				KeyFile:    clusterOpts["kv.keyfile"],
-			},
-			// The actual TLS config that will be used
 			TLS: tlsConfig,
 		}
 	} else {