Skip to content
  • Zarina Yakubova's avatar
    Merge branch 'develop' into feature/#381/tree-of-dependencies · 11506dcb
    Zarina Yakubova authored
    # Conflicts:
    #	.gitignore
    #	cmd/engine-che/engine.go
    #	cmd/engine-stat/dependencies.go
    #	docs/docs.go
    #	docs/swagger.json
    #	docs/swagger.yaml
    #	fixtures/periodical_alarm.json
    #	lib/api/alarm/store.go
    #	lib/api/default.go
    #	lib/api/entity/api.go
    #	lib/api/entity/models.go
    #	lib/api/entity/store.go
    #	lib/api/pbehavior/store.go
    #	lib/api/router.go
    #	lib/api/serviceweather/store.go
    #	lib/api/watcherweather/models.go
    #	lib/canopsis/context/builder.go
    #	lib/canopsis/context/center.go
    #	lib/canopsis/context/center_test.go
    #	lib/canopsis/eventfilter/entity_data_source.go
    #	lib/canopsis/eventfilter/entity_data_source_test.go
    #	lib/canopsis/metaalarm/rule_service.go
    #	lib/canopsis/metaalarm/rule_service_test.go
    #	lib/canopsis/metaalarm/ruleapplicator/complexapplicator_test.go
    #	lib/canopsis/pbehavior/entity_matcher_test.go
    #	lib/canopsis/types/model_entity.go
    #	lib/mongo/mongo.go
    #	lib/utils/utils.go
    11506dcb