Home Explore Help
Register Sign In
publics
/
etcd-io__etcd
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix merge conflicts

Rob Szumski 12 years ago
parent
bc7297c2d0 39ddb29e63
commit
1d4912b22f
1 changed files with 1 additions and 2 deletions
Split View Show Diff Stats
  1. 1 2
      Documentation/cluster-discovery.md

+ 1 - 2
Documentation/cluster-discovery.md
View File 

@@ -42,5 +42,4 @@ The Discovery API submits the `-peer-addr` of each etcd instance to the configur
 
 
 ## Stale Peers
 
 
-The discovery API will automatically clean up the address of a stale peer that is no longer part of the cluster. The TTL for this process is a week, which should be long enough to handle any extremely long outage you may encounter. There is no harm in having stale peers in the list until they are cleaned up, since an etcd instance only needs to connect to one valid peer in the cluster to join.
 
-
 
+The discovery API will automatically clean up the address of a stale peer that is no longer part of the cluster. The TTL for this process is a week, which should be long enough to handle any extremely long outage you may encounter. There is no harm in having stale peers in the list until they are cleaned up, since an etcd instance only needs to connect to one valid peer in the cluster to join.