summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2002-10-15 16:12:53 +0200
committerunknown <pem@mysql.com>2002-10-15 16:12:53 +0200
commitb9ce7600692730c5649aac3786ecc47bd8869912 (patch)
tree063d5c4fc101c3dd56f2f73eca3d52f27a1cf470 /BitKeeper
parent9bca9fb7513f60630a9ad699241388930f7b910f (diff)
parentb36dbc4a43b11d2ecd2953f01520857d3e85228a (diff)
downloadmariadb-git-b9ce7600692730c5649aac3786ecc47bd8869912.tar.gz
Merge pmartin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok9
1 files changed, 5 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 000e7588370..851a8f4be33 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,3 +1,4 @@
+Administrador@light.
Administrator@co3064164-a.
Administrator@co3064164-a.rochd1.qld.optushome.com.au
Administrator@fred.
@@ -33,6 +34,7 @@ lenz@kallisto.mysql.com
lenz@mysql.com
miguel@hegel.br
miguel@hegel.local
+miguel@light.
miguel@light.local
monty@bitch.mysql.fi
monty@donna.mysql.fi
@@ -47,10 +49,12 @@ monty@tramp.mysql.fi
monty@work.mysql.com
mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org
+mwagner@work.mysql.com
nick@mysql.com
nick@nick.leippe.com
paul@central.snake.net
paul@teton.kitebird.com
+pem@mysql.com
peter@linux.local
peter@mysql.com
ram@ram.(none)
@@ -62,6 +66,7 @@ serg@build.mysql2.com
serg@serg.mysql.com
serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi
+tfr@beta.frontier86.ee
tfr@indrek.tfr.cafe.ee
tfr@sarvik.tfr.cafe.ee
tim@bitch.mysql.fi
@@ -82,7 +87,3 @@ worm@altair.is.lan
zak@balfor.local
zak@linux.local
zgreant@mysql.com
-tfr@beta.frontier86.ee
-Administrador@light.
-mwagner@work.mysql.com
-pem@mysql.com