Merge master into dev-1.22 to keep in sync

Signed-off-by: Ritu Panjwani <panjwaniritu45@gmail.com>
2021-06-11 10:47:20 -07:00
parent d8f4b5c161 1e402f834d
commit 20efd69cd9
58 changed files with 846 additions and 795 deletions
@@ -13,7 +13,7 @@ weight: 45

 _Topology Aware Hints_ enable topology aware routing by including suggestions
 for how clients should consume endpoints. This approach adds metadata to enable
-consumers of EndpointSlice and / or and Endpoints objects, so that traffic to
+consumers of EndpointSlice and / or Endpoints objects, so that traffic to
 those network endpoints can be routed closer to where it originated.

 For example, you can route traffic within a locality to reduce