Merge branch 'main' into docs/contrib-ladder-proposal

.gitvote.yml

@@ -0,0 +1,17 @@
+profiles:
+  default:
+    duration: 4w
+    pass_threshold: 51
+    periodic_status_check: "2 weeks"
+    close_on_passing: true
+    allowed_voters:
+      teams:
+        - oversight-committee-members
+  super:
+    duration: 4w
+    pass_threshold: 66
+    periodic_status_check: "2 weeks"
+    close_on_passing: true
+    allowed_voters:
+      teams:
+        - oversight-committee-members

GOVERNANCE.md

@@ -72,15 +72,29 @@ In the event that consensus cannot be reached, a Maintainer can call for a vote
 
 ### Explicit Voting
 
-The secondary decision-making process is done by explicit voting. 
+The secondary decision-making process is done by explicit voting.
 
-#### Simple Majority Vote
+#### Process
 
-If a vote is called, the default is a simple majority vote - more than half of the appropriate deciding body.
+We use the [GitVote](https://github.com/cncf/gitvote) bot to streamline our voting efforts.
 
-#### Supermajority Vote
+- Organization-level voting must take place in the community (this repository) repository.
+- Only GitHub Issues and Pull Requests are supported.
 
-In some cases, a supermajority vote is required for decision making - at least two-thirds of the appropriate deciding body.
+The GitVote [repository](https://github.com/cncf/gitvote/blob/main/README.md) has additional information on usage.
+
+There are some constant configurations between voting profiles:
+
+- The Oversight Committee members have binding votes in the community repository. All in the community can and are encouraged to participate in the vote, even if their vote is not binding.
+- The duration for voting is four weeks with status checks occurring at the two week mark.
+
+##### Simple Majority Vote
+
+If a vote is called, the default is a simple majority vote - more than half of the appropriate deciding body. This is the default profile used when calling a vote with `/vote`
+
+##### Supermajority Vote
+
+In some cases, a supermajority vote is required for decision making - at least two-thirds of the appropriate deciding body. You can use `/vote-super` to initiate this type of vote.
 
 Some examples include:
 

MAINTAINERS.md

@@ -12,6 +12,7 @@ The project-wide oversight committee
 - [`jpower432`](https://github.com/jpower432)
 - [`mrgadgil`](https://github.com/mrgadgil) - Chair
 - [`yuji-watanabe-jp`](https://github.com/yuji-watanabe-jp)
+- [`vikas-agarwal76`](https://github.com/vikas-agarwal76)
 
 ### Org Admins
 
@@ -23,6 +24,7 @@ Team with admin access to the `oscal-compass` org.
 - [`vikas-agarwal76`](https://github.com/vikas-agarwal76)
 - [`mrgadgil`](https://github.com/mrgadgil)
 - [`jflowers`](https://github.com/jflowers)
+- [`degenaro`](https://github.com/degenaro)
 - [`thelinuxfoundation`](https://github.com/thelinuxfoundation)
 
 ## Community
@@ -33,3 +35,4 @@ Team with maintainer access to the Community repository
 
 - [`jpower432`](https://github.com/jpower432)
 - [`vikas-agarwal76`](https://github.com/vikas-agarwal76)
+- [`degenaro`](https://github.com/degenaro)

README.md

@@ -86,7 +86,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) 2020 The OSCAL Compass Authors. All rights reserved.
+# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -101,3 +101,17 @@ Consult [maintainers](MAINTAINERS.md) for the current list of maintainers for va
 # limitations under the License.
 
 ```
+
+-----
+
+We are a Cloud Native Computing Foundation sandbox project.
+
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://www.cncf.io/wp-content/uploads/2022/07/cncf-white-logo.svg">
+  <img src="https://www.cncf.io/wp-content/uploads/2022/07/cncf-color-bg.svg" width=300 />
+</picture>
+
+The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)".
+
+*OSCAL Compass was originally contributed by IBM.*
+