Merge master into next-major-spec

asyncapi · Oct 10, 2022 · 6e72900 · 6e72900
2 parents c830851 + 949a9ff
commit 6e72900
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -5,4 +5,4 @@
 # For more details, read the following article on GitHub: https://help.github.com/articles/about-codeowners/.
 
 # The default owners are automatically added as reviewers when you open a pull request unless different owners are specified in the file.
-* @fmvilas @derberg @dalelane @asyncapi-bot-eve
+* @fmvilas @derberg @dalelane @smoya @char0n @asyncapi-bot-eve
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -236,7 +236,12 @@ may or may not know about JS, relying on the help of other
 community members to implement the RFC on the
 [AsyncAPI JS Parser](https://www.github.com/asyncapi/parser-js) and the [AsyncAPI JSON Schema](https://github.com/asyncapi/spec-json-schemas).
 
+## Merging pull requests
 
+A pull request can be merged if all the following conditions are met:
+
+* There is, at least, a mininum of 3 approvals from the [repository code owners](./CODEOWNERS).
+* Sufficient time has passed to let all code owners review the pull request. As of now, it should be a minimum of 1 week. If all code owners have already approved a pull request, it's ok not to wait for this period of time.
 
 
 ## References