From 2a08c3e98aefca55ec05cd2c9ea0ac7861def1df Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Sat, 1 Dec 2018 18:46:16 +0000 Subject: [PATCH] docs: fix merge window docs (#5176) Signed-off-by: Rama Chavali Mirrored from https://github.com/envoyproxy/envoy @ 893ca2f4fd2528cf82f20c24b298913485fa65bb --- envoy/api/v2/cds.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/envoy/api/v2/cds.proto b/envoy/api/v2/cds.proto index 132d0204..a1021ec2 100644 --- a/envoy/api/v2/cds.proto +++ b/envoy/api/v2/cds.proto @@ -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.