Skip to content

Commit

Permalink
Merge branch 'main' into preview/known-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
sebbASF committed Jul 31, 2024
2 parents ad64909 + 5c8cf0d commit 93ed27d
Show file tree
Hide file tree
Showing 21 changed files with 198 additions and 831 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/members_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Check members.md listings
on:
push:
paths:
- 'content/foundation/members.md'
- 'members_check.py'
- '.github/workflows/members_check.yml'
pull_request:
paths:
- 'content/foundation/members.md'
- 'members_check.py'
- '.github/workflows/members_check.yml'
workflow_dispatch:
jobs:
members-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: |
python3 members_check.py
3 changes: 2 additions & 1 deletion content/.well-known/security.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ Policy: https://apache.org/security/
# https://www.apache.org/foundation/policies/conduct#diversity-statement
Preferred-Languages: en

Expires: 2024-06-19T00:00:00Z
# https://www.rfc-editor.org/rfc/rfc9116#section-2.5.5
Expires: 2025-06-19T00:00:00Z
2 changes: 1 addition & 1 deletion content/board/policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ and/or to the board.

* Project discussions SHOULD use normal ASF-hosted dev@, user@, and similar mailing lists.

* Projects MAY use their own documented consensus process, or a VOTE, to decide on any [new committers](//www.apache.org/dev/pmc.html#newcommitter) or [PMC members](//www.apache.org/dev/pmc.html#newpmc).
* Projects MAY use their own documented consensus process, or a VOTE, to decide on any [new committers](//www.apache.org/dev/pmc.html#newcommitter) or [PMC members](//www.apache.org/dev/pmc.html#newpmcmember).

### Operate Independently And For The Public Good ([Board](https://whimsy.apache.org/foundation/orgchart/board))

Expand Down
4 changes: 2 additions & 2 deletions content/dev/pmc.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ the new committer has [karma](#newcommitter) (access) to the project repositorie
### Send NOTICEs and followup when adding PMC members
The chair is responsible for sending the NOTICE email to the board, then
updating [committee-info.txt](https://svn.apache.org/repos/private/committers/board/committee-info.txt)
and the LDAP committee group after the candidate accepts -- see the [detailed procedure](#newpmc).
and the LDAP committee group after the candidate accepts -- see the [detailed procedure](#newpmcmember).

### Maintain ASF records on the PMC roster
Maintain information about your PMC's composition in the SVN "committers" repository
Expand Down Expand Up @@ -284,7 +284,7 @@ See also [why would a project move to the Attic?](pmc.html#move-to-attic), above

## PMC membership management {#pmcmembers}

### How to add a PMC member {#newpmc}
### How to add a PMC member {#newpmcmember}

The usual process for adding a member to a PMC is to:

Expand Down
2 changes: 1 addition & 1 deletion content/dev/project-requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ASF-wide policies, as well as for providing various services to all Apache proje

* Project discussions SHOULD use normal ASF-hosted dev@, user@, and similar mailing lists.

* Projects MAY use a documented consensus process or a VOTE for any [new committers](/dev/pmc.html#newcommitter) or [PMC members](/dev/pmc.html#newpmc), and carefully follow policies for recording ICLAs and granting access.
* Projects MAY use a documented consensus process or a VOTE for any [new committers](/dev/pmc.html#newcommitter) or [PMC members](/dev/pmc.html#newpmcmember), and carefully follow policies for recording ICLAs and granting access.

# Technical {#technical}

Expand Down
178 changes: 0 additions & 178 deletions content/foundation/apachecon-rfp.md

This file was deleted.

Loading

0 comments on commit 93ed27d

Please sign in to comment.