summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <mronstrom@build.mysql.com>2004-08-21 15:11:47 +0200
committerunknown <mronstrom@build.mysql.com>2004-08-21 15:11:47 +0200
commit2c7754be960b8aee0e11368f7931eedf91b93e1f (patch)
treecf05eb69fee745debcb27986bd527acf64dcc0b8 /BitKeeper
parent6d1eab0b0e8926ae98f9e87c6bbf92ab9573da5e (diff)
parentb85e699ec8762aba6d767ddfec115dace1afa180 (diff)
downloadmariadb-git-2c7754be960b8aee0e11368f7931eedf91b93e1f.tar.gz
Merge build.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/mronstrom/wl2056 ndb/src/common/mgmcommon/ConfigInfo.cpp: Auto merged ndb/src/common/mgmcommon/LocalConfig.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged ndb/src/kernel/vm/Configuration.cpp: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 76a72fc9b4a..52013cfbd16 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -118,6 +118,7 @@ monty@tik.
monty@tik.mysql.fi
monty@tramp.mysql.fi
monty@work.mysql.com
+mronstrom@build.mysql.com
mronstrom@mysql.com
mskold@mysql.com
msvensson@build.mysql.com