From d362e791eb9e4efa8d87f6d878740e72dc8330ac Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 15 Apr 2021 18:20:46 -0700 Subject: [PATCH] build: fix and bump to 1.18.2 (#16022) Once more unto the breach. Signed-off-by: Matt Klein --- VERSION | 2 +- docs/root/version_history/current.rst | 4 ++-- docs/root/version_history/v1.18.1.rst | 7 +++++++ docs/root/version_history/version_history.rst | 1 + test/integration/multiplexed_integration_test.cc | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 docs/root/version_history/v1.18.1.rst diff --git a/VERSION b/VERSION index ec6d649be650..b57fc7228b62 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.1 +1.18.2 diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index ca0baae62a9c..5b7d079bf56a 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -1,7 +1,7 @@ -1.18.0 (April 15, 2021) +1.18.2 (April 15, 2021) ======================= Bug Fixes --------- -code: fixed some whitespace to make fix_format happy. +code: fixed more build issues on our path to a glorious release. diff --git a/docs/root/version_history/v1.18.1.rst b/docs/root/version_history/v1.18.1.rst new file mode 100644 index 000000000000..5ee0e5fc97b2 --- /dev/null +++ b/docs/root/version_history/v1.18.1.rst @@ -0,0 +1,7 @@ +1.18.1 (April 15, 2021) +======================= + +Bug Fixes +--------- + +code: fixed some whitespace to make fix_format happy. diff --git a/docs/root/version_history/version_history.rst b/docs/root/version_history/version_history.rst index 0874c99b4f87..24e9ae28e692 100644 --- a/docs/root/version_history/version_history.rst +++ b/docs/root/version_history/version_history.rst @@ -7,6 +7,7 @@ Version history :titlesonly: current + v1.18.1 v1.18.0 v1.17.2 v1.17.1 diff --git a/test/integration/multiplexed_integration_test.cc b/test/integration/multiplexed_integration_test.cc index 0b9653b387f8..a3f10631a9e2 100644 --- a/test/integration/multiplexed_integration_test.cc +++ b/test/integration/multiplexed_integration_test.cc @@ -1729,7 +1729,7 @@ TEST_P(Http2MetadataIntegrationTest, UpstreamSendingEmptyMetadata) { upstream_request_->encodeData(0, true); // Verifies that no metadata was received by the client. - response->waitForEndStream(); + ASSERT_TRUE(response->waitForEndStream()); ASSERT_TRUE(response->complete()); EXPECT_EQ(0, response->metadataMapsDecodedCount()); EXPECT_EQ(1, test_server_->counter("cluster.cluster_0.http2.metadata_empty_frames")->value());