Updated Branches: refs/heads/master 9072f6eed -> e819a5f1b
TS-1638: less strict on kernel version checking in clustering Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e819a5f1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e819a5f1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e819a5f1 Branch: refs/heads/master Commit: e819a5f1b9394595d09f595fb9fa501190e0dd95 Parents: 9072f6e Author: Yu Qing <[email protected]> Authored: Tue Oct 29 10:45:48 2013 +0800 Committer: Zhao Yongming <[email protected]> Committed: Thu Oct 31 18:29:19 2013 +0800 ---------------------------------------------------------------------- CHANGES | 3 +++ mgmt/cluster/ClusterCom.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e819a5f1/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8c0761c..3dc9a51 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache Traffic Server 4.1.0 + *( [TS-1638] less strict on kernel version checking in clustering. + Author: Yu Qing + *) [TS-2265] Remove unused log tags for prob, prcb and cgid. *) [TS-2301] Replace the CACHE_READY macro with CacheProcessor::IsCacheReady. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e819a5f1/mgmt/cluster/ClusterCom.cc ---------------------------------------------------------------------- diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc index fa173cc..9be52eb 100644 --- a/mgmt/cluster/ClusterCom.cc +++ b/mgmt/cluster/ClusterCom.cc @@ -798,7 +798,7 @@ ClusterCom::handleMultiCastMessage(char *message) lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR, "Received Multicast message from peer running mis-match" " Operating system, please investigate"); - mgmt_elog("[ClusterCom::handleMultiCastMessage] Received message from peer " + Debug("ccom", "[ClusterCom::handleMultiCastMessage] Received message from peer " "running different os/release '%s'(ours os: '%s' rel: '%s'\n", line, sys_name, sys_release); } @@ -808,7 +808,7 @@ ClusterCom::handleMultiCastMessage(char *message) lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR, "Received Multicast message from peer running mis-match" " Operating system release, please investigate"); - mgmt_elog("[ClusterCom::handleMultiCastMessage] Received message from peer " + Debug("ccom", "[ClusterCom::handleMultiCastMessage] Received message from peer " "running different os/release '%s'(ours os: '%s' rel: '%s'\n", line, sys_name, sys_release); }
