summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <salle@geopard.(none)>2002-11-11 10:52:39 +0200
committerunknown <salle@geopard.(none)>2002-11-11 10:52:39 +0200
commitfa771db2e7faac353fa700b135a3f5abc70d62a9 (patch)
treef0cd10e3916b1e83b35f4d191ddd0020982dd767 /BitKeeper
parentcbc851c605e96023a6058949b0ea7fa68b89441c (diff)
parent8c14ed4230fb808c4bc5d7664345a909eb190520 (diff)
downloadmariadb-git-fa771db2e7faac353fa700b135a3f5abc70d62a9.tar.gz
Merge akeremidarski@work.mysql.com:/home/bk/mysql
into geopard.(none):/storage/bk/mysql-3.23 BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 127fdf89c43..9fe594f93bc 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -33,4 +33,5 @@ serg@build.mysql2.com
serg@serg.mysql.com
serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi
+walrus@mysql.com
zak@balfor.local