Skip to content

Commit

Permalink
Merge branch 'main' into docs/contrib-ladder-proposal
Browse files Browse the repository at this point in the history
  • Loading branch information
jpower432 authored Oct 16, 2024
2 parents 92f161a + 2588ccc commit 2f36e4e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
7 changes: 7 additions & 0 deletions ADOPTERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# OSCAL Compass Adopters

This is a list of organizations that have publicly shared their adoption:

- [Red Hat](https://www.redhat.com)

If your organization is using OSCAL Compass and would like to be included in this list, please open a pull request.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Software License 2.0. Using the SPDX format is the simplest approach.
e.g.

```text
# Copyright (c) 2020 The OSCAL Compass Authors. All rights reserved.
# Copyright (c) 2024 The OSCAL Compass Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
11 changes: 10 additions & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

The following document outlines how the OSCAL Compass project governance operates.

## Principles

The OSCAL Compass community adheres to the following principles:

**Open**: OSCAL-Compass is open source. See project guidelines [here](./CONTRIBUTING.md).
**Welcoming and respectful**: See [Code of Conduct](./CODE_OF_CONDUCT.md).
**Transparent and accessible**: Work and collaboration should be done in public.
**Merit**: Ideas and contributions are accepted according to their technical merit and alignment with project objectives, scope, and design principles. See our design proposal [process](./proposals/README.md)

## Governance Structure Overview

The OSCAL Compass Project has a two-level governance structure with an Oversight Committee and Project Maintainers.
Expand Down Expand Up @@ -112,4 +121,4 @@ Trivial changes that do not introduce policy changes may be approved by two memb

## Acknowledgements

This governance approach and documentation was adapted from InstructLab [governance](https://github.com/instructlab/community/blob/main/GOVERNANCE.md).
Sections of this document were adapted from [InstructLab](https://github.com/instructlab/community/blob/main/GOVERNANCE.md) and [CoreDNS](https://github.com/coredns/coredns/blob/master/GOVERNANCE.md) projects.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,12 @@ Please attend! All are invited.
Every other Tuesday starting on April 23, 2024 · 11:00 – 11:30am ET
[convert to your local time](https://mytime.io/11am/ET)

**Where**: [Google Meet Link](https://meet.google.com/cfr-rkxp-emg)
**Where**: [Zoom](https://zoom-lfx.platform.linuxfoundation.org/meeting/91709345128?password=5510325d-895f-4932-a843-df728dc3028d)

Dial in:
(US) +1 319-483-6865‬ PIN: ‪269 825 741‬#\
[More phone numbers](https://tel.meet/cfr-rkxp-emg?pin=9717189704231)

**What**: Meeting agenda and notes [Google Docs](https://docs.google.com/document/d/1XTYM7xnWlIqd-8Nn5-qtgvgk8kH3NSmYle5yZvaS7qs/edit?usp=sharing)

We also have a [shared calendar](https://calendar.google.com/calendar/u/0?cid=NjZjNjdjY2E0ZGZmMWYwN2Q5OGQwZjkxYTMyOGFjZWYyZjRhNjdhMzQzOWYxNGY4NmIyZGU1NmEwYTgzNGEwMUBncm91cC5jYWxlbmRhci5nb29nbGUuY29t).
We also have a [shared calendar](https://zoom-lfx.platform.linuxfoundation.org/meetings/trestlegrc?view=week).

**Recordings**

Expand Down Expand Up @@ -86,7 +83,7 @@ If you would like to see the detailed LICENSE click [here](LICENSE).
Consult [maintainers](MAINTAINERS.md) for the current list of maintainers for various projects in the oscal-compass community.

```text
# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved.
# Copyright (c) 2024 The OSCAL Compass Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down

0 comments on commit 2f36e4e

Please sign in to comment.