# Conflicts:
#	adapter/pom.xml
#	adapter/src/main/java/eu/melodic/upperware/adapter/communication/proactive/ProactiveClientServiceForAdapterImpl.java
#	adapter/src/main/java/eu/melodic/upperware/adapter/planexecutor/colosseum/NodeTaskExecutor.java
#	cp_generator/pom.xml
#	event-management/.gitignore
#	event-management/bin/rest/1_new_camel.bat
#	event-management/bin/rest/2_update_solution.bat
#	event-management/bin/rest/2b_update_solution.bat
#	event-management/bin/rest/3_install_ems_client.bat
#	event-management/broker-client/src/main/java/eu/melodic/event/brokerclient/BrokerClient.java
#	event-management/control-service/src/main/java/eu/melodic/event/control/webconf/WebSecurityConfig.java
#	event-management/control-service/src/main/resources/public/index.html
#	gui-backend/pom.xml
#	gui-backend/src/main/java/eu/melodic/upperware/guibackend/ApplicationContext.java
#	gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/process/ProcessController.java
#	gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonMapper.java
#	melodic-cache/pom.xml

MetaSolver: Renamed Pubsub.topics to Pubsub.startupTopics in...

See merge request !85

MetaSolver: Renamed Pubsub.topics to Pubsub.startupTopics in MetaSolverProperties (and related code). Added Pubsub.commonTopics for topic subscriptions initialized in every call of 'updateSubscriptions' and 'onApplicationEvent' methods. Updated configuration accordingly (including default common subscription 'prediction.slo_severity_value')

Predictions in grafana

See merge request !83

changes to rely on BYON node id not the Node Candidate id

See merge request !84

metasolver / add-predictions-support

See merge request !82

Undeploy application

See merge request !81

fix for incompatible types for byon node

See merge request !80

EMS: Broker-CEP: Improved EventMap class

See merge request !79

EMS: Broker-CEP: Fixed metricValue, level and timestamp conversion problem

See merge request !78