Skip to content

Commit

Permalink
docs: fix merge window docs (envoyproxy#5176)
Browse files Browse the repository at this point in the history
Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
  • Loading branch information
ramaraochavali authored and fredlas committed Mar 5, 2019
1 parent d4870a1 commit 4193d38
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions api/envoy/api/v2/cds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,8 @@ message Cluster {
// merged and delivered in one shot when the duration expires. The start of the duration is when
// the first update happens. This is useful for big clusters, with potentially noisy deploys
// that might trigger excessive CPU usage due to a constant stream of healthcheck state changes
// or metadata updates. By default, this is not configured and updates apply immediately. Also,
// the first set of updates to be seen apply immediately as well (e.g.: a new cluster).
// or metadata updates. The first set of updates to be seen apply immediately (e.g.: a new
// cluster).
//
// If this is not set, we default to a merge window of 1000ms. To disable it, set the merge
// window to 0.
Expand Down

0 comments on commit 4193d38

Please sign in to comment.