Skip to content

Commit

Permalink
This commit implements #382 in response to the lack of explicit language
Browse files Browse the repository at this point in the history
on how reversions are to be handled. This is in response to the events
transpiring in #433 and #449.

Additionally this PR corrects the misspelling of the pluralization of
the word veto.

This is a direct follow up, per procedures with a single squashed commit, of #450.
  • Loading branch information
hexylena committed Aug 5, 2015
1 parent 2ddb970 commit e3f2255
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 6 deletions.
33 changes: 28 additions & 5 deletions CONTRIBUTING.md
Expand Up @@ -135,7 +135,14 @@ Pull requests changing or clarifying the procedures governing this repository:
pull request for each person added or removed.

Any other pull request requires at least 1 *+1* binding vote from someone other
than the author of the pull request.
than the author of the pull request. A member of the committers group merging a
pull request is considered an implicit +1.

Pull requests marked *[WIP]* (i.e. work in progress) in the title by the
author(s), or tagged WIP via GitHub tags, may *not* be merged without
coordinating the removal of that tag with the pull request author(s), and
completing the removal of that tag from wherever it is present in the open pull
request.

### Timelines

Expand All @@ -145,16 +152,16 @@ open for comment. Subjectively speaking though - larger and more potentially
controversial pull requests containing enhancements should remain open for a at
least a few days to give everyone the opportunity to weigh in.

### Vetos
### Vetoes

A note on vetos (*-1* votes) taken verbatim from the
A note on vetoes (*-1* votes) taken verbatim from the
[Apache Foundation](http://www.apache.org/foundation/voting.html):

>"A code-modification proposal may be stopped dead in its tracks by a -1 vote
by a qualified voter. This constitutes a veto, and it cannot be overruled nor
overridden by anyone. Vetos stand until and unless withdrawn by their casters.
overridden by anyone. Vetoes stand until and unless withdrawn by their casters.
>
>To prevent vetos from being used capriciously, they must be accompanied by a
>To prevent vetoes from being used capriciously, they must be accompanied by a
technical justification showing why the change is bad (opens a security
exposure, negatively affects performance, etc. ). A veto without a
justification is invalid and has no weight."
Expand All @@ -163,6 +170,22 @@ For votes regarding non-coding issues such as procedure changes, the requirement
that a veto is accompanied by a *technical* justification is relaxed somewhat,
though a well reasoned justification must still be included.

### Reversions

A *-1* vote on any recently merged pull request requires an immediate
reversion of the merged pull request. The backout of such a pull request
invokes a mandatory, minimum 72 hour, review period.

- Recently merged pull requests are defined as a being within the past 168 hours (7
days), so as to not prevent forward progress, while allowing for reversions of
things merged without proper review and consensus.
- The person issuing the -1 vote will, upon commenting `-1` with technical
justification per the vetoes section, immediately open a pull request to
revert the original merge in question. If any committer other than the -1
issuer deems the justification technical - regardless of whether they agree
with justification - that committer must then merge the pull request to
revert.

### Direct Commit Access

The Galaxy *committers* group may only commit directly to Galaxy (i.e. outside
Expand Down
2 changes: 1 addition & 1 deletion doc/source/project/organization.rst
Expand Up @@ -73,7 +73,7 @@ CONTRIBUTING_ document - with one exception - a `commmitter` may not vote
against their own removal from the group (for obvious reasons).

Given the responsibilities and power invested in this group - it is important
that individuals not actively working on Galaxy in some fashion are removed
that individuals not actively working on Galaxy in some fashion are removed from
the group. If individuals in this group intend to change jobs or reallocate
volunteer activities and will no longer be active in the Galaxy community,
they should withdraw from membership of this group. Periodically, active
Expand Down

0 comments on commit e3f2255

Please sign in to comment.