Merge branch 'main' into patch-1

mpwarres · web-flow · commit fee3fee09a30 · 2024-08-05T00:03:06.000-04:00
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -18,13 +18,13 @@ on:
 
   pull_request:
     branches:
-    - master
+    - main
     - 'envoy-release/**'
     - 'istio-release/**'
 
   push:
     branches:
-    - master
+    - main
     - 'envoy-release/**'
     - 'istio-release/**'
 
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @PiotrSikora
+* @PiotrSikora @martijneken @mpwarres

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @PiotrSikora`
	`1`	`+* @PiotrSikora @martijneken @mpwarres`