fix(etcd/client.go): add DialTimeout for 0.6.x

This re-implements kelseyhightower#112 for confd 0.6.x.

backends/etcd/client.go

@@ -6,6 +6,7 @@ package etcd
 import (
  "errors"
  "strings"
+ "time"
 
  goetcd "github.com/coreos/go-etcd/etcd"
 )
@@ -28,6 +29,8 @@ func NewEtcdClient(machines []string, cert, key string, caCert string) (*Client,
  } else {
  c = goetcd.NewClient(machines)
  }
+ // Configure the DialTimeout, since 1 second is often too short
+ c.SetDialTimeout(time.Duration(3) * time.Second)
  success := c.SetCluster(machines)
  if !success {
  return &Client{c}, errors.New("cannot connect to etcd cluster: " + strings.Join(machines, ","))