From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sat, 19 Nov 2011 00:04:04 +0000 (-0800)
Subject: Merge trunk at revision 8006.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b88a0caa4a1476a07c5ab4fb22d3a69adcfde94;p=thirdparty%2Fbugzilla.git

Merge trunk at revision 8006.
---

5b88a0caa4a1476a07c5ab4fb22d3a69adcfde94
diff --cc Bugzilla/Install/DB.pm
index e9a3fba4c0,84267de412..83e46d5518
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@@ -656,9 -656,9 +656,12 @@@ sub update_table_definitions 
      # 2011-06-15 dkl@mozilla.com - Bug 658929
      _migrate_disabledtext_boolean();
  
+     # 2011-10-11 miketosh - Bug 690173
+     _on_delete_set_null_for_audit_log_userid();
+ 
 +    # 2011-08-29 rowebb@gmail.com - Bug 679547
 +    $dbh->bz_add_column('bugs', 'master_bug_id', {TYPE => 'INT3'});
 +
      ################################################################
      # New --TABLE-- changes should go *** A B O V E *** this point #
      ################################################################