summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-08-05 16:08:36 +0300
committerunknown <monty@mashka.mysql.fi>2003-08-05 16:08:36 +0300
commit46a2d8a2f6dd4f0168e09abffb5527c8be2d4a93 (patch)
tree3e2020be6d7b570a82be7b15ce60e5c353e2a087 /BitKeeper
parent02f5cbfe63b65f081ed7dd820be7ffb388c2e359 (diff)
parent6417c182df2b027d766075876ce969701d3e038a (diff)
downloadmariadb-git-46a2d8a2f6dd4f0168e09abffb5527c8be2d4a93.tar.gz
Merge
BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok4
1 files changed, 4 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 782120fff0d..b0b48e63980 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -20,10 +20,12 @@ bk@admin.bk
bk@mysql.r18.ru
carsten@tsort.bitbybit.dk
davida@isil.mysql.com
+dlenev@mysql.com
gluh@gluh.(none)
gluh@gluh.mysql.r18.ru
greg@mysql.com
guilhem@mysql.com
+gweir@build.mysql.com
gweir@work.mysql.com
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
@@ -51,6 +53,8 @@ jcole@sarvik.tfr.cafe.ee
jcole@tetra.spaceapes.com
jorge@linux.jorge.mysql.com
kaj@work.mysql.com
+konstantin@mysql.com
+kostja@oak.local
lenz@kallisto.mysql.com
lenz@mysql.com
miguel@hegel.(none)