summaryrefslogtreecommitdiff
path: root/BitKeeper/etc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-05-13 22:49:49 +0200
committerunknown <serg@serg.mylan>2005-05-13 22:49:49 +0200
commit89001262cf3b5b873b5f868a7cf06f4691bd4dbd (patch)
tree3e38a6c99d86b6a6921a5669e18c1f1c4325304d /BitKeeper/etc
parent4e6177d87f5727d442a3c19483979394d3f9435a (diff)
parent9a8d59b02c5e50d0b35e0f4271fdd18c51e80297 (diff)
downloadmariadb-git-89001262cf3b5b873b5f868a7cf06f4691bd4dbd.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'BitKeeper/etc')
-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