diff --git a/go/cmd/zk/command/root.go b/go/cmd/zk/command/root.go index 30c2a93fd0a..f3f02e7d4f2 100644 --- a/go/cmd/zk/command/root.go +++ b/go/cmd/zk/command/root.go @@ -32,8 +32,8 @@ var ( Root = &cobra.Command{ Use: "zk", - Short: "zk is a tool for wrangling the zookeeper.", - Long: `zk is a tool for wrangling the zookeeper. + Short: "zk is a tool for wrangling zookeeper.", + Long: `zk is a tool for wrangling zookeeper. It tries to mimic unix file system commands wherever possible, but there are some slight differences in flag handling. diff --git a/go/flags/endtoend/vtcombo.txt b/go/flags/endtoend/vtcombo.txt index 89d972f2f6b..ffa2b84970a 100644 --- a/go/flags/endtoend/vtcombo.txt +++ b/go/flags/endtoend/vtcombo.txt @@ -139,6 +139,7 @@ Flags: --gc_check_interval duration Interval between garbage collection checks (default 1h0m0s) --gc_purge_check_interval duration Interval between purge discovery checks (default 1m0s) --gh-ost-path string override default gh-ost binary full path + --grpc-send-session-in-streaming If set, will send the session as last packet in streaming api to support transactions in streaming --grpc-use-effective-groups If set, and SSL is not used, will set the immediate caller's security groups from the effective caller id's groups. --grpc-use-static-authentication-callerid If set, will set the immediate caller id to the username authenticated by the static auth plugin. --grpc_auth_mode string Which auth plugin implementation to use (eg: static)