Skip to content

Commit adb4414

Browse files
authored
Merge branch 'main' into onboarding
Signed-off-by: Daniel Krook <[email protected]>
2 parents 8b29d67 + 9de2cdb commit adb4414

File tree

7 files changed

+90
-97
lines changed

7 files changed

+90
-97
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ body:
7979
8080
## :computer: Component details
8181
82-
Please fill in the table below, with one row for each unique component for which a license exception is requested. In the "Purpose" column, please briefly (1-2 sentences) describe the functionality of the component and the reason why the Project is using it.
82+
Please fill in the table below, with one row for each unique component for which a license exception is requested. In the "Project Usage URL" column, please include one or more URLs showing the CNCF project source code or other artifact where the component and its license are located or used. In the "Purpose" column, please briefly (1-2 sentences) describe the functionality of the component and the reason why the Project is using it.
8383
8484
- type: textarea
8585
id: component_details
8686
attributes:
8787
label: "List of components requiring an exception"
88-
value: "| Component | Upstream URL | License(s) | Purpose |\n|-----------|-----------|-----------|-----------|\n| | | | |\n| | | | |\n| | | | |"
88+
value: "| Component | Upstream URL | Project Usage URL | License(s) | Purpose |\n|-----------|-----------|-----------|-----------|-----------|\n| | | | |\n| | | | |\n| | | | |"
8989
validations:
9090
required: true
9191

.github/pull_request_template.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
_If you're adding a new maintainer to the CSV file, please review each of these actions as well:_
44

5-
- [ ] The maintainer has also created or updated their [LFX Individual Dashboard profile](https://openprofile.dev/).
6-
- [ ] You've also sent an email with the addresses to <[email protected]> for access to Service Desk and mailing lists.
5+
- [ ] You've provided a link to documentation where the project has approved the maintainer changes.
6+
- [ ] The maintainer(s) also created or updated their [LFX Individual Dashboard profile](https://openprofile.dev/).
7+
- [ ] You've sent an email with the email address(es) to <[email protected]> for invitations to Service Desk and mailing lists.
78
- [ ] Optional: You've also sent a PR with affiliation updates to [cncf/gitdm](https://github.com/cncf/gitdm?tab=readme-ov-file#cncf-gitdm).

.github/workflows/validate-csv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- 'project-maintainers.csv'
99

1010
jobs:
11-
verify-cvs-validation:
11+
verify-csv-validation:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4

cncf-marketing-committee-chair.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Minimum 3 hours a month
4646

4747
## Past MC Chairs ##
4848

49+
* 2025: Rohit Ghumare
4950
* 2024: Carla Gaggini
5051
* 2023: Lori Lorusso
5152
* 2022: Carla Gaggini

copyright-notices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ following (where XYZ is the project's name):
2222
- **Copyright The XYZ Authors.**
2323
- **Copyright The XYZ Contributors.**
2424
- **Copyright Contributors to the XYZ project.**
25-
- **Copyright © contributors to XYZ, established as XYZ a Series of LF Projects, LLC.**
25+
- **Copyright Contributors to XYZ a Series of LF Projects, LLC.**
2626

2727
> [!NOTE]
2828
> Use the fourth format if the project has been converted to the [Series LLC model](https://github.com/cncf/foundation/issues/910).

policies-guidance/online-programs-guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ If you are a CNCF member and eligible to participate in our online programs, [pl
8282
* Character limit for abstract is 10,000
8383
* Please submit your title, abstract, speaker bios, speaker titles and speaker headshots upon submission
8484

85-
### If we do not receive all neccessary documents and assets upon submission, your online program is subject to proponement
85+
### If we do not receive all neccessary documents and assets upon submission, your online program is subject to postponement

0 commit comments

Comments
 (0)