diff options
| author | unknown <jimw@mysql.com> | 2005-02-17 13:42:18 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-17 13:42:18 -0800 |
| commit | 342f7987498d0e52c33cf9d4e638bf961a26985f (patch) | |
| tree | f43ba07c5e9aabd1b2cd8d29a104eeb6700c45d8 /BitKeeper | |
| parent | ebfd9da374c9570ea26db2583582c52270e519f1 (diff) | |
| parent | 71cf9ab0cbefe84b7c84b1b0afd4ab4407c87429 (diff) | |
| download | mariadb-git-342f7987498d0e52c33cf9d4e638bf961a26985f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e519dbb1de2..5acd00e6604 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -38,6 +38,7 @@ brian@zim.(none) carsten@tsort.bitbybit.dk cps@silver_beast.(none) davida@isil.mysql.com +dean@mysql.com dellis@goetia.(none) dlenev@brandersnatch.localdomain dlenev@build.mysql.com @@ -222,6 +223,7 @@ serg@sergbook.mysql.com sergefp@mysql.com sinisa@rhols221.adsl.netsonic.fi stewart@mysql.com +svoj@mysql.com tfr@beta.frontier86.ee tfr@indrek.tfr.cafe.ee tfr@sarvik.tfr.cafe.ee diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 30238c06b93..4e0135fa822 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -62,7 +62,6 @@ From: $FROM To: $INTERNALS Subject: bk commit into $VERSION tree ($CHANGESET)$BS $BH - Below is the list of changes that have just been committed into a local $VERSION repository of $USER. When $USER does a push these changes will be propagated to the main repository and, within 24 hours after the |