summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <jani@hynda.mysql.fi>2001-04-20 01:12:58 +0300
committerunknown <jani@hynda.mysql.fi>2001-04-20 01:12:58 +0300
commitd6cac4dde11b8b1f5217c6158b9000a747fb85bf (patch)
treedec911cc1b5e9967a289732f4c066fb935133ad8 /BitKeeper/etc
parentb61b56b2939eb45b89fa9de98f16bf4a6a158f51 (diff)
parent682067f493bed437bec14f300ec20efee7839f9d (diff)
downloadmariadb-git-d6cac4dde11b8b1f5217c6158b9000a747fb85bf.tar.gz
Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql
BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'BitKeeper/etc')
-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 59b8ddd98d4..0cf09ad6901 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,6 +1,7 @@
-sasha@mysql.sashanet.com
-monty@donna.mysql.fi
-serg@serg.mysql.com
-jcole@abel.spaceapes.com
heikki@donna.mysql.fi
+jani@hynda.mysql.fi
+jcole@abel.spaceapes.com
+monty@donna.mysql.fi
monty@work.mysql.com
+sasha@mysql.sashanet.com
+serg@serg.mysql.com