summaryrefslogtreecommitdiff
path: root/BitKeeper
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
commit33504c6f7c697f650e07a4231522dcafb9bbb524 (patch)
tree3e38a6c99d86b6a6921a5669e18c1f1c4325304d /BitKeeper
parent0be31397a7a7b2b40d0bafe901933d72c186e0a2 (diff)
parent1403a15ada392f9fe6a9881a391575f017b8ac33 (diff)
downloadmariadb-git-33504c6f7c697f650e07a4231522dcafb9bbb524.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
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