Solved conflicts
Showing
- build.gradle 128 additions, 122 deletionsbuild.gradle
- settings.gradle 4 additions, 2 deletionssettings.gradle
- src/main/java/eu/h2020/symbiote/Icinga2Manager.java 3 additions, 3 deletionssrc/main/java/eu/h2020/symbiote/Icinga2Manager.java
- src/main/java/eu/h2020/symbiote/PlatformManager.java 49 additions, 0 deletionssrc/main/java/eu/h2020/symbiote/PlatformManager.java
- src/main/java/eu/h2020/symbiote/constants/MonitoringConstants.java 37 additions, 36 deletions...java/eu/h2020/symbiote/constants/MonitoringConstants.java
- src/main/java/eu/h2020/symbiote/rest/crm/CRMMessageHandler.java 151 additions, 110 deletions...in/java/eu/h2020/symbiote/rest/crm/CRMMessageHandler.java
- src/main/java/eu/h2020/symbiote/rest/crm/CRMRestService.java 24 additions, 23 deletionssrc/main/java/eu/h2020/symbiote/rest/crm/CRMRestService.java
- src/main/java/eu/h2020/symbiote/service/PlatformMonitoringRestService.java 1 addition, 1 deletion...h2020/symbiote/service/PlatformMonitoringRestService.java
- src/main/resources/bootstrap.properties 43 additions, 11 deletionssrc/main/resources/bootstrap.properties
- src/test/java/eu/h2020/symbiote/MonitoringPublishTests.java 2 additions, 2 deletionssrc/test/java/eu/h2020/symbiote/MonitoringPublishTests.java
- src/test/java/eu/h2020/symbiote/MonitoringRabbitTests.java 1 addition, 1 deletionsrc/test/java/eu/h2020/symbiote/MonitoringRabbitTests.java
- src/test/resources/keystore.jks 0 additions, 0 deletionssrc/test/resources/keystore.jks
Loading
Please register or sign in to comment