summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorjoreland@mysql.com <>2004-09-20 17:25:55 +0200
committerjoreland@mysql.com <>2004-09-20 17:25:55 +0200
commitefb0ae38af1b1cb6680f8d3c3e1a5fc5c949ab65 (patch)
tree38d6616cb283e118dd1795dbfab6cf3cec93e832 /BitKeeper
parente315fb4a32de4775077c5ccda165fbdce7b1cb99 (diff)
parentf982cd9d460edb16af01f19ed9c0cb1127fc5a62 (diff)
downloadmariadb-git-efb0ae38af1b1cb6680f8d3c3e1a5fc5c949ab65.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok3
1 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index f72b47da651..cc4f31cf414 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -100,6 +100,7 @@ miguel@hegel.txg.br
miguel@light.
miguel@light.local
miguel@sartre.local
+mikael@mc04.(none)
mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
mikron@mikael-ronstr-ms-dator.local
mleich@mysql.com
@@ -130,6 +131,7 @@ mwagner@here.mwagner.org
mwagner@work.mysql.com
mydev@mysql.com
mysql@home.(none)
+mysql@mc04.(none)
mysqldev@build.mysql2.com
mysqldev@melody.local
mysqldev@mysql.com
@@ -159,6 +161,7 @@ ram@ram.(none)
ranger@regul.home.lan
rburnett@build.mysql.com
root@home.(none)
+root@mc04.(none)
root@x3.internalnet
salle@banica.(none)
salle@geopard.(none)