Skip to content
  • Zarina Yakubova's avatar
    Merge branch 'develop' into feature/#2686/idle-rule · 74d9cd40
    Zarina Yakubova authored
    # Conflicts:
    #	cmd/engine-pbehavior/message_processor.go
    #	lib/api/logger/action_logger.go
    #	lib/api/router.go
    #	lib/api/validators.go
    #	lib/canopsis/alarm/mongo_adapter_legacy.go
    #	lib/canopsis/context/center.go
    #	lib/canopsis/entity/mongo_adapter.go
    #	lib/canopsis/entity/mongo_adapter_legacy.go
    #	lib/canopsis/entityservice/service.go
    #	lib/canopsis/eventfilter/rule_test.go
    #	lib/canopsis/types/event.go
    #	lib/validator/validator.go
    #	mocks/lib/canopsis/context/context.go
    74d9cd40