From 5044e576913a355d661b2998e625677514edfb0f Mon Sep 17 00:00:00 2001
From: Otto van der Schaaf <oschaaf@we-amp.com>
Date: Sun, 14 Jun 2020 23:38:54 +0200
Subject: [PATCH 1/2] Update Envoy to b612236bcd8ef3cd14d904c21348888a6755d5d6

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
---
 bazel/repositories.bzl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 54e932782..32f6da009 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "8fd1a52e608f7223b4864ca913cc3ed82340991d"  # June 10th, 2020
-ENVOY_SHA = "9b4f619e149f62e3b8ab668b6ebd707363f497d8c345095248ee891057e43676"
+ENVOY_COMMIT = "b612236bcd8ef3cd14d904c21348888a6755d5d6"  # June 14th, 2020
+ENVOY_SHA = "3921cedea57380c75f9a97b046f6171cc21b15b2392aaa75f4c97e9adf48677c"
 
 HDR_HISTOGRAM_C_VERSION = "0.9.13"  # Feb 22nd, 2020
 HDR_HISTOGRAM_C_SHA = "2bd4a4631b64f2f8cf968ef49dd03ff3c51b487c3c98a01217ae4cf4a35b8310"

From f1419d36c98a7c157b9f3ffe5e47ce7837c26fb9 Mon Sep 17 00:00:00 2001
From: Otto van der Schaaf <oschaaf@we-amp.com>
Date: Mon, 15 Jun 2020 00:30:35 +0200
Subject: [PATCH 2/2] Regen CLI documentation

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
---
 source/server/README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/server/README.md b/source/server/README.md
index 36b2ee8ae..85d2d23a0 100644
--- a/source/server/README.md
+++ b/source/server/README.md
@@ -148,7 +148,8 @@ bazel-bin/nighthawk_test_server  [--disable-extensions <string>]
 [--max-obj-name-len <uint64_t>]
 [--max-stats <uint64_t>] [--mode
 <string>] [--parent-shutdown-time-s
-<uint32_t>] [--drain-time-s <uint32_t>]
+<uint32_t>] [--drain-strategy <string>]
+[--drain-time-s <uint32_t>]
 [--file-flush-interval-msec <uint32_t>]
 [--service-zone <string>]
 [--service-node <string>]
@@ -205,6 +206,10 @@ normally) or 'validate' (validate configs and exit).
 --parent-shutdown-time-s <uint32_t>
 Hot restart parent shutdown time in seconds
 
+--drain-strategy <string>
+Hot restart drain sequence behaviour, one of 'gradual' (default) or
+'immediate'.
+
 --drain-time-s <uint32_t>
 Hot restart and LDS removal drain time in seconds