Skip to content
  • Zarina Yakubova's avatar
    Merge branch 'develop' into feature/#5280/correlation-delay · 04aaf163
    Zarina Yakubova authored
    # Conflicts:
    #	community/go-engines-community/lib/canopsis/action/service.go
    #	community/go-engines-community/lib/canopsis/action/service_test.go
    #	community/go-engines-community/lib/canopsis/alarm/activation_service.go
    #	community/go-engines-community/lib/canopsis/alarm/activation_service_test.go
    #	community/go-engines-community/lib/canopsis/types/event_easyjson.go
    #	community/go-engines-community/mocks/lib/canopsis/alarm/alarm.go
    04aaf163