summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <serg@infomag.ape.relarn.ru>2000-08-15 21:52:42 +0400
committerunknown <serg@infomag.ape.relarn.ru>2000-08-15 21:52:42 +0400
commit4d820053db1a446969b74a4b586b3f5d42f490d1 (patch)
tree135f6b5b6961c6b7f5bd0d7351d07ae18d9a776f /BitKeeper
parent264ae115fdcdb6c88eae2aec66c3477cb22a90a5 (diff)
parentc53d371cc9ceb8878ce4cae28e82804124340974 (diff)
downloadmariadb-git-4d820053db1a446969b74a4b586b3f5d42f490d1.tar.gz
Merge
BitKeeper/etc/logging_ok: Auto merged
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok20
1 files changed, 10 insertions, 10 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 505102a839c..ed442907849 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,15 +1,15 @@
-tim@localhost.polyesthetic.msg
-tim@work.mysql.com
-monty@work.mysql.com
-tonu@work.mysql.com
-sinisa@work.mysql.com
-paul@work.mysql.com
-jamppa@work.mysql.com
+bk@work.mysql.com
davida@work.mysql.com
+jamppa@work.mysql.com
+jcole@jcole.burghcom.com
matt@work.mysql.com
-serg@work.mysql.com
-bk@work.mysql.com
+monty@work.mysql.com
+paul@work.mysql.com
sasha@mysql.sashanet.com
sasha@work.mysql.com
-jcole@jcole.burghcom.com
serg@infomag.ape.relarn.ru
+serg@work.mysql.com
+sinisa@work.mysql.com
+tim@localhost.polyesthetic.msg
+tim@work.mysql.com
+tonu@work.mysql.com