diff options
| author | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-04-07 19:07:44 +0200 |
| commit | dfd59e296e2c267a21f1ea8b3b937e07730dad0d (patch) | |
| tree | e5ac1517ff3dccc42352b7bac39ecd1c093d0ae6 /BitKeeper/etc | |
| parent | 1541f2e7949416d6e172ef6406ecf140d3b26659 (diff) | |
| parent | 61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff) | |
| download | mariadb-git-dfd59e296e2c267a21f1ea8b3b937e07730dad0d.tar.gz | |
Merge 4.1 -> 5.0.
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/config | 1 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index ea30f368b52..c609fcdbd49 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -71,3 +71,4 @@ hours: [arjen:]checkout:get [nick:]checkout:get checkout:edit +eoln:unix diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index b8607af3b3c..6c00b91b13f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -2,6 +2,7 @@ Administrador@light. Administrator@co3064164-a. Administrator@co3064164-a.rochd1.qld.optushome.com.au Administrator@fred. +Greg@greg-laptop. Miguel@light.local Sinisa@sinisa.nasamreza.org WAX@sergbook.mysql.com @@ -10,6 +11,7 @@ administrador@light.hegel.local ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com antony@ltantony.rdg.cyberkinetica.homeunix.net +arjen@bitbike.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com arjen@george.bitbike.com @@ -26,6 +28,7 @@ carsten@tsort.bitbybit.dk davida@isil.mysql.com dlenev@brandersnatch.localdomain dlenev@build.mysql.com +dlenev@jabberwock.localdomain dlenev@mysql.com gerberb@ou800.zenez.com gluh@gluh.(none) @@ -36,6 +39,7 @@ guilhem@mysql.com gweir@build.mysql.com gweir@work.mysql.com harrison@mysql.com +harry@corona.lordblink.com heikki@donna.mysql.fi heikki@hundin.mysql.fi heikki@rescue. @@ -47,6 +51,8 @@ hf@deer.mysql.r18.ru hf@genie.(none) igor@hundin.mysql.fi igor@rurik.mysql.com +ingo@mysql.com +jani@a80-186-24-72.elisa-laajakaista.fi jani@dsl-jkl1657.dial.inet.fi jani@dsl-kpogw4gb5.dial.inet.fi jani@hynda.(none) @@ -58,8 +64,10 @@ jani@rhols221.arenanet.fi jani@ua126d19.elisa.omakaista.fi jani@ua141d10.elisa.omakaista.fi jani@ua167d18.elisa.omakaista.fi +jani@ua72d24.elisa.omakaista.fi jcole@abel.spaceapes.com jcole@main.burghcom.com +jcole@mugatu.jcole.us jcole@mugatu.spaceapes.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com @@ -69,6 +77,7 @@ konstantin@mysql.com kostja@oak.local lenz@kallisto.mysql.com lenz@mysql.com +marko@hundin.mysql.fi miguel@hegel.(none) miguel@hegel.br miguel@hegel.local @@ -94,6 +103,7 @@ monty@work.mysql.com mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@work.mysql.com +mydev@mysql.com mysql@home.(none) mysqldev@build.mysql2.com nick@mysql.com @@ -123,8 +133,10 @@ root@x3.internalnet salle@banica.(none) salle@geopard.(none) salle@geopard.online.bg +salle@vafla.home salle@vafla.online.bg sasha@mysql.sashanet.com +serg@build.mysql.com serg@build.mysql2.com serg@serg.mylan serg@serg.mysql.com @@ -146,6 +158,7 @@ tonu@hundin.mysql.fi tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet +ulli@morbus.(none) venu@hundin.mysql.fi venu@myvenu.com venu@work.mysql.com |