diff options
author | unknown <monty@narttu.> | 2002-05-09 06:29:49 +0300 |
---|---|---|
committer | unknown <monty@narttu.> | 2002-05-09 06:29:49 +0300 |
commit | e9827c505bac038fd7a27dbb6263444191b9a9dd (patch) | |
tree | 61b918980133c5483e64b1d07c747f6185614599 /BitKeeper | |
parent | e6b07a071ee7e2719210778c1a7d788fa01b934c (diff) | |
parent | 3f717550667ba0773b6b215db486a7b13986a47e (diff) | |
download | mariadb-git-e9827c505bac038fd7a27dbb6263444191b9a9dd.tar.gz |
merge
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 6c0a462296e..374a72adde8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -22,11 +22,14 @@ jcole@tetra.spaceapes.com jorge@linux.jorge.mysql.com kaj@work.mysql.com lenz@kallisto.mysql.com +lenz@mysql.com miguel@hegel.local miguel@light.local monty@bitch.mysql.fi monty@donna.mysql.fi monty@hundin.mysql.fi +monty@narttu. +monty@narttu.mysql.fi monty@tik.mysql.fi monty@tramp.mysql.fi monty@work.mysql.com @@ -53,4 +56,3 @@ tonu@x3.internalnet venu@work.mysql.com zak@balfor.local zak@linux.local -lenz@mysql.com |