summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <jani@rhols221.arenanet.fi>2002-05-24 14:09:01 +0300
committerunknown <jani@rhols221.arenanet.fi>2002-05-24 14:09:01 +0300
commita5d1744ae3959acf2311421e4a0874ca106342a3 (patch)
treed2ba63b4f9a97d939b7352661402c4b3bc776360 /BitKeeper
parent50a32945b3fe4cc34aefa7b942822cccadae8bb6 (diff)
parent072e605cdc5f8803d90f88877c7abe1b4efaa551 (diff)
downloadmariadb-git-a5d1744ae3959acf2311421e4a0874ca106342a3.tar.gz
Merge work:/home/bk/mysql-4.0
into rhols221.arenanet.fi:/home/my/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok5
1 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 494dce5df58..73dfa70efb8 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -13,9 +13,11 @@ davida@isil.mysql.com
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
jani@dsl-jkl1657.dial.inet.fi
+jani@hynda.(none)
jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi
jani@rhols221.adsl.netsonic.fi
+jani@rhols221.arenanet.fi
jcole@abel.spaceapes.com
jcole@main.burghcom.com
jcole@mugatu.spaceapes.com
@@ -59,7 +61,6 @@ tonu@volk.internalnet
tonu@x153.internalnet
tonu@x3.internalnet
venu@work.mysql.com
+worm@altair.is.lan
zak@balfor.local
zak@linux.local
-jani@hynda.(none)
-worm@altair.is.lan