Merge pull request #1168 from bcwaldon/moar-flags

etcd: deprecate remaining v0.4.6 flags

main.go

@@ -54,17 +54,22 @@ var (
 	peerTLSInfo   = transport.TLSInfo{}
 
 	deprecated = []string{
+		"addr",
+		"cluster-active-size",
+		"cluster-remove-delay",
+		"cluster-sync-interval",
 		"config",
-		"peers-file",
-		"peer-heartbeat-interval",
-		"peer-election-timeout",
+		"force",
 		"max-result-buffer",
 		"max-retry-attempts",
+		"peer-addr",
+		"peer-heartbeat-interval",
+		"peer-election-timeout",
+		"peers-file",
 		"retry-interval",
 		"snapshot",
-		"cluster-active-size",
-		"cluster-remove-delay",
-		"cluster-sync-interval",
+		"v",
+		"vv",
 	}
 )