Fix merge conflict resolution

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Jun 4, 2024 · 88d3de4 · 88d3de4
1 parent 4cb785d
commit 88d3de4
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/go/flags/endtoend/vtgate.txt b/go/flags/endtoend/vtgate.txt
@@ -160,7 +160,6 @@ Usage of vtgate:
       --stderrthreshold severityFlag                                     logs at or above this threshold go to stderr (default 1)
       --stream_buffer_size int                                           the number of bytes sent from vtgate for each stream call. It's recommended to keep this value in sync with vttablet's query-server-config-stream-buffer-size. (default 32768)
       --structured-logging                                               whether to use structured logging (PlanetScale Log) logger or the original (glog) logger
-      --table-refresh-interval int                                       interval in milliseconds to refresh tables in status page with refreshRequired class
       --tablet-filter-tags StringMap                                     Specifies a comma-separated list of tablet tags (as key:value pairs) to filter the tablets to watch.
       --tablet_filters strings                                           Specifies a comma-separated list of 'keyspace|shard_name or keyrange' values to filter the tablets to watch.
       --tablet_grpc_ca string                                            the server ca to use to validate servers when connecting