Merge branch 'develop'
Conflicts:
README.md
build.gradle
cli/build.gradle
fault-correlator/build.gradle
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/ConfigurationBeans.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/NFVORequestorWrapperWrapper.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/OpenbatonEvent.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/OpenbatonEventReceiver.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/RecoveryAction.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/RecoveryActionStatus.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/RecoveryActionType.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/RestEventReceiver.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/droolsconfig/DroolsAutoConfiguration.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/droolsconfig/KieSessionGlobalConfigurationImpl.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/exceptions/FaultCorrelatorException.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/exceptions/FaultManagementPolicyException.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/exceptions/NFVORequestorException.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/interfaces/EventNfvoReceiver.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/interfaces/EventReceiver.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/interfaces/FaultCorrelatorManager.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/interfaces/KieSessionGlobalConfiguration.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/interfaces/NFVORequestorWrapper.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/policymanagement/MonitoringManagerImpl.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/policymanagement/PolicyManagerImpl.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/policymanagement/catalogue/NetworkServiceRecordShort.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/policymanagement/catalogue/VNFCInstanceShort.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/policymanagement/catalogue/VirtualDeploymentUnitShort.java
fault-correlator/src/main/java/org.openbaton.faultmanagement.fc/policymanagement/catalogue/VirtualNetworkFunctionRecordShort.java
fault-correlator/src/main/resources/rules/fault_resolution.drl
fault-correlator/src/main/resources/rules/pre_rules.drl
fault-correlator/src/main/resources/rules/vnfm_fault_correlator.drl
gradle/application.java.gradle
gradle/run.application.java.gradle
high-availability/build.gradle
high-availability/src/main/java/org/openbaton/faultmanagement/ha/HighAvailabilityManager.java
high-availability/src/main/java/org/openbaton/faultmanagement/ha/HighAvailabilityManagerImpl.java
high-availability/src/main/java/org/openbaton/faultmanagement/ha/exceptions/HighAvailabilityException.java
openbaton-fm.sh
settings.gradle
src/main/java/org/openbaton/faultmanagement/Application.java
src/main/java/org/openbaton/faultmanagement/system/SystemStartup.java
src/main/resources/application.properties
