Merge pull request #20145 from mqliang/quorum-read

Auto commit by PR queue bot
2016-02-02 05:50:41 -08:00
parent d082357259 b0e06c14e5
commit c5260c8c71
17 changed files with 60 additions and 37 deletions
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -90,6 +90,7 @@ enable-server
 etcd-config
 etcd-mutation-timeout
 etcd-prefix
+etcd-quorum-read
 etcd-server
 etcd-servers
 etcd-servers-overrides