Switch etcd default port to 2379, in line with 2.x.

Fixes #753

CHANGELOG.md

@@ -4,14 +4,17 @@ DEPRECATIONS/BREAKING CHANGES:
 
  * Policy Name Casing: Policy names are now normalized to lower-case on write,
    helping prevent accidental case mismatches. For backwards compatibility,
-policy names are not currently normalized when reading or deleting. [GH-676]
+   policy names are not currently normalized when reading or deleting. [GH-676]
+ * Default etcd port number: the default connection string for the `etcd`
+   physical store uses port 2379 instead of port 4001, which is the port used
+   by the supported version 2.x of etcd. [GH-753]
 
 FEATURES:
 
  * **CRL Checking for Certificate Authentication**: The `cert` backend now
    supports pushing CRLs into the mount and using the contained serial numbers
-for revocation checking. See the documentation for the `cert` backend for more
-info. [GH-330]
+   for revocation checking. See the documentation for the `cert` backend for
+   more info. [GH-330]
 
 IMPROVEMENTS:
 

physical/etcd.go

@@ -75,7 +75,7 @@ func newEtcdBackend(conf map[string]string) (Backend, error) {
 	}
 
 	// Set a default machines list and check for an overriding address value.
-	machines := "http://128.0.0.1:4001"
+	machines := "http://128.0.0.1:2379"
 	if address, ok := conf["address"]; ok {
 		machines = address
 	}
@@ -300,6 +300,7 @@ func (c *EtcdLock) periodicallyRenewSemaphoreKey(stopCh chan struct{}) {
 		}
 	}
 }
+
 // watchForKeyRemoval continuously watches a single non-directory key starting
 // from the provided etcd index and closes the provided channel when it's
 // deleted, expires, or appears to be missing.

website/source/docs/config/index.html.md

@@ -164,7 +164,7 @@ For etcd, the following options are supported:
 
   * `address` (optional) - The address(es) of the etcd instance(s) to talk to.
       Can be comma separated list (protocol://host:port) of many etcd instances.
-      Defaults to "http://localhost:4001" if not specified.
+      Defaults to "http://localhost:2379" if not specified.
 
 #### Backend Reference: S3