summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <monty@rescue.>2002-09-05 14:00:05 +0300
committerunknown <monty@rescue.>2002-09-05 14:00:05 +0300
commitd43ba827edaf08739e3f854be8314c84a437e032 (patch)
tree9477e41ee3165c82ad24e17fc5e51a2da0e18338 /BitKeeper
parent54e6652e48daf269355fd82707494b5ead4f9a0c (diff)
parenta7ef648c96380b11bf43ced5901c16276a933ab5 (diff)
downloadmariadb-git-d43ba827edaf08739e3f854be8314c84a437e032.tar.gz
Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0
BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok6
1 files changed, 4 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index b1d89453e85..5a913bef98b 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -14,6 +14,7 @@ bell@sanja.is.com.ua
davida@isil.mysql.com
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
+heikki@work.mysql.com
jani@dsl-jkl1657.dial.inet.fi
jani@hynda.(none)
jani@hynda.mysql.fi
@@ -29,6 +30,7 @@ jorge@linux.jorge.mysql.com
kaj@work.mysql.com
lenz@kallisto.mysql.com
lenz@mysql.com
+miguel@hegel.br
miguel@hegel.local
miguel@light.local
monty@bitch.mysql.fi
@@ -37,12 +39,14 @@ monty@hundin.mysql.fi
monty@mashka.mysql.fi
monty@narttu.
monty@narttu.mysql.fi
+monty@rescue.
monty@tik.
monty@tik.mysql.fi
monty@tramp.mysql.fi
monty@work.mysql.com
mwagner@cash.mwagner.org
mwagner@evoq.mwagner.org
+nick@mysql.com
nick@nick.leippe.com
paul@central.snake.net
paul@teton.kitebird.com
@@ -75,5 +79,3 @@ worm@altair.is.lan
zak@balfor.local
zak@linux.local
zgreant@mysql.com
-miguel@hegel.br
-monty@rescue.