Merge branch 'master' of ssh://git.samba.org/data/git/samba

[mimir/samba.git] / MAINTAINERS.txt

diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 08e76263ab3ad9884960ac6a78c6e5141d7af360..466ae54d6a783cd70df7b407fb8ca6a9c6aa08a4 100644 (file)
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -18,7 +18,7 @@ policy:
 
          If no maintainer is available for longer than a week
          discussion on the samba-technical list and review by 2
-         Samba-Team members is needed (e.g. Andrew Tridgell <tridge@samba.org
+         Samba-Team members is needed (e.g. Andrew Tridgell <tridge@samba.org>
          and Volker Lendecke <vl@samba.org>).
 
          Larger changes need also discussion on the samba-technical list
@@ -37,6 +37,30 @@ policy:
          Larger changes need also discussion on the samba-technical list
          and review by all maintainers.
 
+files: buildtools/**, source4/**/wscript
+maintainers:
+         Andrew Tridgell <tridge@samba.org>
+         Jelmer Vernooij <jelmer@samba.org>
+policy:
+         small commits to master allowed if all existing tests
+         pass. Larger commits require discussion on the samba-technical
+         list and review by the maintainer
+
+files: lib/tdb
+maintainers:
+         Rusty Russell <rusty@samba.org>
+policy:
+         Mail/CC changes to the maintainer, commit the changes
+         unless the maintainer objects.
+
+files: lib/talloc
+maintainers:
+         Andrew Tridgell <tridge@samba.org>
+         Rusty Russell <rusty@samba.org>
+policy:
+         small commits to master allowed if all existing tests
+         pass. Larger commits require discussion on samba-technical
+         list and review by the maintainer
 
 files: lib/tevent/py*, lib/talloc/py*, source4/lib/ldb/py*, lib/tdb/py*
 maintainers: