RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-27 08:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite recursion bug in Alert merge

Browse Source
This commit is contained in:
Fabian Reinartz 2015-10-15 16:21:36 +02:00
parent fa7955c9bc
commit 78008cd012
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
types/types.go
View File

@ -65,7 +65,7 @@ func Alerts(alerts ...*Alert) model.Alerts {
// A new alert is returned, the labels are assumed to be equal.
func (a *Alert) Merge(o *Alert) *Alert {
// Let o always be the younger alert.
if !a.UpdatedAt.Before(o.UpdatedAt) {
if o.UpdatedAt.Before(a.UpdatedAt) {
return o.Merge(a)
}