chore: rebase with merge

Signed-off-by: Vishnu Attur <[email protected]>

.github/ISSUE_TEMPLATE/license-exception-request.yaml

@@ -4,7 +4,7 @@ description: Submit an exception request
 title: "[License Exception Request] [Project] [License]"
 labels:
  - licensing
-assignees: krook,amye
+assignees: krook,jeefy,joannalee333
 body:
  - type: markdown
  attributes:
@@ -14,7 +14,7 @@ body:
  If it is Apache-2.0 for code or CC-BY-4.0 for documentation, no further exception request is required.
  
  
- Does it meet the [Allowlist policy](https://github.com/cncf/foundation/blob/main/allowed-third-party-license-policy.md)? If so, no further exception request is required.
+ Does it meet the [Allowlist policy](https://github.com/cncf/foundation/blob/main/allowed-third-party-license-policy.md#cncf-allowlist-license-policy)? If so, no further exception request is required.
  
  
  For all other license exception requests, we need the following information.

allowed-third-party-license-policy.md

@@ -22,7 +22,9 @@ apply:
 1. It is fully licensable under the approved licenses set forth below under
 [Approved Licenses] (including combinations with Apache-2.0); AND
 
-2. It is stored unmodified in a designated third-party folder; AND
+2. It is either (A) stored unmodified in a designated third-party folder, or (B)
+not stored in the CNCF project repository and instead retrieved at installation
+or build time from the upstream third party repository or package repository; AND
 
 3. It has indications of substantial use outside CNCF by satisfying one of the
 following:
@@ -48,7 +50,9 @@ List.
 - BSD-3-Clause
 - MIT
 - ISC
+- PSF-2.0
 - Python-2.0
+- Python-2.0.1
 - PostgreSQL
 - X11
 - Zlib

project-maintainers.csv

@@ -524,6 +524,7 @@ Graduated,Argo, Saravanan Balasubramanian,Intuit,sarabala1979,https://github.com
 ,,Blake Pettersson,Akuity,blakepettersson,
 ,,Alan Clucas,Pipekit,Joibel,
 ,,Isitha Subasinghe,Pipekit,isubasinghe,
+,,Anton Gilgur,Independent,agilgur5,
 Sandbox,CNI-Genie,Zefeng (Kevin) Wang,Huawei ,kevin-wangzefeng,https://github.com/cni-genie/CNI-Genie/blob/master/MAINTAINERS
 ,,Sushantha Kumar,Huawei ,sushanthakumar,
 ,,Jun Du,Huawei ,m1093782566,
@@ -1573,3 +1574,14 @@ Sandbox,Radius,Ryan Nowak, Microsoft, rynowak, https://github.com/radius-project
 ,,Karishma Chawla, Microsoft, kachawla,
 ,,Sylvain Niles, Microsoft, sylvainsf,
 ,,Will Tsai, Microsoft, willtsai,
+Sandbox,Connect RPC,Akshay Shah,Buf,akshayjshah,https://github.com/connectrpc/connectrpc.com/blob/main/MAINTAINERS.md
+,,Eddie Seay,Chick-fil-A,eseay,
+,,Edward McFarlane,Buf,emcfarlane,
+,,Josh Humphries,Buf,jhump,
+,,Matt Robenolt,PlanetScale,mattrobenolt,
+,,Michael Rebello,Airbnb,rebello95,
+,,Peter Edge,Buf,bufdev,
+,,Philip Warren,Buf,pkwarren,
+,,Sri Krishna Paritala,Buf,srikrsna-buf,
+,,Steve Ayers,Buf,smaye81,
+,,Timo Stamm,Buf,timostamm,