build: fix and bump to 1.18.2 (#16022)

Once more unto the breach. Signed-off-by: Matt Klein <[email protected]>
envoyproxy · Apr 16, 2021 · d362e79 · d362e79
1 parent 9614605
commit d362e79
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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());
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ Version history @@
       :titlesonly:
       current
+      v1.18.1
       v1.18.0
       v1.17.2
       v1.17.1
@@ Expand Down @@