diff options
| author | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-29 19:26:52 +0300 |
| commit | afbe601302fc59c498437321b296ed6c8d360564 (patch) | |
| tree | 23bcc9a71fe7237887a111b158e30f5a6bb665d3 /BitKeeper | |
| parent | 67456bb970cc949ceb5779b230592e455843c35c (diff) | |
| parent | 541883f9d89a8d38affba60bf9506289a6232da1 (diff) | |
| download | mariadb-git-afbe601302fc59c498437321b296ed6c8d360564.tar.gz | |
merge with 4.1
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 14 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index abff7bb08e9..e7152099ed3 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -24,15 +24,18 @@ bar@bar.udmsearch.izhnet.ru bar@deer.(none) bar@gw.udmsearch.izhnet.ru bar@mysql.com +bar@noter.intranet.mysql.r18.ru bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk bk@mysql.r18.ru brian@avenger.(none) brian@brian-akers-computer.local +brian@private-client-ip-101.oz.net carsten@tsort.bitbybit.dk cps@silver_beast.(none) davida@isil.mysql.com +dellis@goetia.(none) dlenev@brandersnatch.localdomain dlenev@build.mysql.com dlenev@jabberwock.localdomain @@ -50,6 +53,7 @@ gweir@build.mysql.com gweir@work.mysql.com harrison@mysql.com harry@corona.lordblink.com +hartmut@mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi heikki@rescue. @@ -63,7 +67,10 @@ igor@hundin.mysql.fi igor@rurik.mysql.com ingo@mysql.com jan@hundin.mysql.fi +jani@a193-229-222-105.elisa-laajakaista.fi +jani@a193-229-222-2.elisa-laajakaista.fi jani@a80-186-24-72.elisa-laajakaista.fi +jani@a80-186-41-201.elisa-laajakaista.fi jani@a80-186-8-224.elisa-laajakaista.fi jani@dsl-jkl1657.dial.inet.fi jani@dsl-kpogw4gb5.dial.inet.fi @@ -94,7 +101,9 @@ kostja@oak.local lenz@kallisto.mysql.com lenz@mysql.com magnus@neptunus.(none) +magnus@shellback.(none) marko@hundin.mysql.fi +matt@mysql.com miguel@hegel.(none) miguel@hegel.br miguel@hegel.local @@ -103,8 +112,10 @@ miguel@hegel.txg.br miguel@light. miguel@light.local miguel@sartre.local +mikael@mc04.(none) mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se mikron@mikael-ronstr-ms-dator.local +mleich@mysql.com mmatthew@markslaptop. monty@bitch.mysql.fi monty@butch. @@ -122,6 +133,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 @@ -131,6 +143,7 @@ mwagner@here.mwagner.org mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) +mysql@mc04.(none) mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com @@ -165,6 +178,7 @@ ram@ram.(none) ranger@regul.home.lan rburnett@build.mysql.com root@home.(none) +root@mc04.(none) root@x3.internalnet salle@banica.(none) salle@geopard.(none) diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 47afc77118a..b2e982761db 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -21,6 +21,7 @@ then CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet` BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/ BUG#\1/p'` +WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'` if [ "$BUG" = "" ] then @@ -37,7 +38,7 @@ fi List-ID: <bk.mysql-$VERSION> From: $FROM To: $TO -Subject: bk commit - $VERSION tree ($CHANGESET)$BUG +Subject: bk commit - $VERSION tree ($CHANGESET)${BUG}${WL} EOF bk changes -v -r+ |