diff --git a/checkin_notes b/checkin_notes
index 367ca5d8c3..bca5ad4aa0 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6826,3 +6826,9 @@ Rom 27 June 2007
diagnostics.C, .h
diagnostics_win.C
+David 27 June 2007
+ - user web: host merge: consider CPUs compatible if both
+ are vendor "AuthenticAMD".
+
+ html/inc/
+ host.inc
diff --git a/html/inc/host.inc b/html/inc/host.inc
index 30cf001cb3..c6ae677742 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -274,6 +274,8 @@ function cpus_compatible($host1, $host2) {
} else {
return false;
}
+ } else if (strstr($p1, "AuthenticAMD") && strstr($p2, "AuthenticAMD")) {
+ return true;
} else {
if ($host2->p_vendor != $host1->p_vendor) return false;
@@ -322,16 +324,16 @@ function hosts_compatible($host1, $host2) {
//
if ($host1->total_credit && $host->total_credit) {
if (!times_disjoint($host1, $host2)) {
- //echo "
h2 $host2->create_time $host2->rpc_time";
+ echo "
h2 $host2->create_time $host2->rpc_time";
return false;
}
}
if (!os_compatible($host1, $host2)) {
- //echo "
$host1->id $host2->id: name\n";
+ echo "
$host1->id $host2->id: name\n";
return false;
}
if (!cpus_compatible($host1, $host2)) {
- //echo "
$host1->id $host2->id: cpu\n";
+ echo "
$host1->id $host2->id: cpu\n";
return false;
}
return true;