summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2005-05-13 13:26:08 +0200
committerkonstantin@mysql.com <>2005-05-13 13:26:08 +0200
commite5c916f7e88b8927dbe2f994f94a08d90fa615d2 (patch)
tree6f7d08bd5e3f8bddd1935591e33f15c1ad448d41 /BitKeeper
parent6e71a81915179b29b084cf2b50e79c483ea596b6 (diff)
parent3dbe7fb2ca58fb53ae3335b07d13ec66dd07633d (diff)
downloadmariadb-git-e5c916f7e88b8927dbe2f994f94a08d90fa615d2.tar.gz
Merge
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/config1
-rw-r--r--BitKeeper/etc/logging_ok1
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config
index c609fcdbd49..1ac24031dca 100644
--- a/BitKeeper/etc/config
+++ b/BitKeeper/etc/config
@@ -69,6 +69,7 @@ pager:
hours:
[serg:]checkout:get
[arjen:]checkout:get
+[kostja:]checkout:get
[nick:]checkout:get
checkout:edit
eoln:unix
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 311403f93e6..3f0d0ce05fb 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -126,6 +126,7 @@ kaa@polly.local
kaj@work.mysql.com
kent@mysql.com
konstantin@mysql.com
+kosipov@production.mysql.com
kostja@oak.local
lars@mysql.com
lenz@kallisto.mysql.com