summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorhf@bisonxp.(none) <>2002-07-09 10:42:24 +0500
committerhf@bisonxp.(none) <>2002-07-09 10:42:24 +0500
commitd8c94e942b35a95611eeee8b9c18291d519f46a1 (patch)
treeb21a32ca85bae8d5e16f2b05a4cee9a8c74df6e1 /BitKeeper
parentbc7e8b09159ba6cf2554c1e5a735167b3c3d373d (diff)
parent984c84c2347395e5364100a2039b588bab0136f3 (diff)
downloadmariadb-git-d8c94e942b35a95611eeee8b9c18291d519f46a1.tar.gz
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok3
1 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 77fb78694c2..c299ad93cc3 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -14,6 +14,7 @@ davida@isil.mysql.com
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
hf@bison.(none)
+hf@bisonxp.(none)
jani@dsl-jkl1657.dial.inet.fi
jani@hynda.(none)
jani@hynda.mysql.fi
@@ -66,7 +67,7 @@ tonu@x153.internalnet
tonu@x3.internalnet
venu@myvenu.com
venu@work.mysql.com
+walrus@mysql.com
worm@altair.is.lan
zak@balfor.local
zak@linux.local
-hf@bisonxp.(none)