diff options
| author | Carolyn Van Slyck <carolyn.vanslyck@microsoft.com> | 2018-06-12 17:17:50 -0500 |
|---|---|---|
| committer | Carolyn Van Slyck <carolyn.vanslyck@microsoft.com> | 2018-06-17 10:29:53 -0500 |
| commit | f25c3c33300da59b449bf3ff1f9a9a8bffd8792c (patch) | |
| tree | 74cc13a7d44ba954698ad5b31c6d16c3c10675fb | |
| parent | a76e730597f9c1b2a7597e086b05c91e4d08eb5f (diff) | |
We now use prow's do-not-merge/hold
| -rw-r--r-- | sig-service-catalog/charter.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sig-service-catalog/charter.md b/sig-service-catalog/charter.md index bc30ec9a..c028ae8d 100644 --- a/sig-service-catalog/charter.md +++ b/sig-service-catalog/charter.md @@ -101,7 +101,7 @@ The following, non-exhaustive, items are out of scope: any topic, ultimately any changes made to the codebase must be approved by the maintainers. - Pull requests are required to have at least 2 maintainers approve them using the `LGTM 1` and `LGTM 2` labels. -- Pull requests that are labeled with `do not merge` or have an on-going +- Pull requests that are labeled with `do-not-merge/hold` or have an on-going discussion must not be merged until all concerns are addressed. - Disagreements are mainly resolved via consensus. In the event that a common decision cannot be made, then a vote among the maintainers will be taken. |