Skip to content

Commit 620e548

Browse files
committed
Merge pull request #4195 from mboersma/docs-sync-lgtm-policy
docs(contributing): sync up maintainer lgtm policy
2 parents 336783c + 5c26d9c commit 620e548

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

MAINTAINERS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ The current core maintainers of Deis:
5252
* Matt Butcher - <mbutcher@engineyard.com> ([@technosophos](https://github.com/technosophos))
5353
* Matthew Fisher - <mfisher@engineyard.com> ([@bacongobbler](https://github.com/bacongobbler))
5454

55-
No pull requests can be merged until at least one core maintainer signs off with a [Code LGTM](http://docs.deis.io/en/latest/contributing/standards/#merge-approval). The other LGTM can come from either a core maintainer
56-
or contributing maintainer.
55+
No pull requests can be merged until at least one core maintainer signs off with an
56+
[LGTM](http://docs.deis.io/en/latest/contributing/standards/#merge-approval). The other LGTM can
57+
come from either a core maintainer or contributing maintainer.
5758

5859
## Contributing maintainers
5960

docs/contributing/standards.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Example
119119

120120
.. note::
121121

122-
You can install a git hook that checks your commit message format with ``make commit-hook``
122+
You can install a git hook that checks your commit message format with ``make commit-hook``
123123

124124
Subject Line
125125
""""""""""""
@@ -169,6 +169,10 @@ to indicate that a PR is acceptable. Any code change--other than
169169
a simple typo fix or one-line documentation change--requires at least two
170170
maintainers to accept it.
171171

172+
No pull requests can be merged until at least one core maintainer_ signs off
173+
with an LGTM. The other LGTM can come from either a core maintainer or
174+
contributing maintainer.
175+
172176
If the PR is from a Deis maintainer, then he or she should be the one to close
173177
it. This keeps the commit stream clean and gives the maintainer the benefit of
174178
revisiting the PR before deciding whether or not to merge the changes.
@@ -183,3 +187,4 @@ revisiting the PR before deciding whether or not to merge the changes.
183187
.. _`pull request`: https://github.com/deis/deis/pulls
184188
.. _`pull requests`: https://github.com/deis/deis/pulls
185189
.. _`GitHub issue`: https://github.com/deis/deis/issues
190+
.. _maintainer: https://github.com/deis/deis/blob/master/MAINTAINERS.md

0 commit comments

Comments
 (0)