summaryrefslogtreecommitdiff
path: root/HACKING
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-05-25 16:51:23 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-05-25 16:51:23 +0100
commitb6b15f052f880963dc7261a0fc9c509d211b6d32 (patch)
tree2b2ae3334f5b3a695a4588e54454626e0b7a01ea /HACKING
parent8acb6d685b77b667e2b074a5e469ef6b2bd4753c (diff)
parent4a6c68c0ffafbc85bdf7d49688cb7afb114541d5 (diff)
downloaddbus-b6b15f052f880963dc7261a0fc9c509d211b6d32.tar.gz
Merge branch 'dbus-1.4'
Diffstat (limited to 'HACKING')
-rw-r--r--HACKING17
1 files changed, 15 insertions, 2 deletions
diff --git a/HACKING b/HACKING
index 64dc0409..e776fd6d 100644
--- a/HACKING
+++ b/HACKING
@@ -303,6 +303,20 @@ rules are:
- if there's a live unresolved controversy about a change,
don't commit it while the argument is still raging.
+ - at their discretion, members of the reviewer group may also commit
+ branches/patches under these conditions:
+
+ - the branch does not add or change API, ABI or wire-protocol
+
+ - the branch solves a known problem and is covered by the regression tests
+
+ - there are no objections from the rest of the review group within
+ a week of the patches being attached to Bugzilla
+
+ - the committer gets a positive review on Bugzilla from someone they
+ consider qualified to review the change (e.g. a colleague with D-Bus
+ experience; not necessarily a member of the reviewer group)
+
- regardless of reviews, to commit a patch:
- make check must pass
- the test suite must be extended to cover the new code
@@ -331,5 +345,4 @@ John Palmieri <johnp@redhat.com>
Scott James Remnant <scott@netsplit.com>
Will Thompson <will.thompson@collabora.co.uk>
Simon McVittie <simon.mcvittie@collabora.co.uk>
-
-
+David Zeuthen <davidz@redhat.com>