Merge pull request #587 in MEL/upperware from master to rc3.1
* commit 'cfb4af80': latency utility in case of one element in range - fixed NaN credentials for connection from dlms-agent to activeMQ in ems credentials for connection from dlms to activeMQ in ems
Showing
- dlms/DLMSController/src/main/java/eu/melodic/dlms/algorithms/network_latency/Algo_NetworkLatencyOverhead.java 5 additions, 1 deletion...gorithms/network_latency/Algo_NetworkLatencyOverhead.java
- dlms/DLMSController/src/main/java/eu/melodic/dlms/metric/receiver/metricvalue/MetricValueMonitorBean.java 14 additions, 20 deletions...s/metric/receiver/metricvalue/MetricValueMonitorBean.java
- dlms/DLMSController/src/main/java/eu/melodic/dlms/metric/receiver/properties/DlmsMetricProperties.java 11 additions, 10 deletions...dlms/metric/receiver/properties/DlmsMetricProperties.java
- dlmsAgent/src/main/java/eu/melodic/dlms/MetricsController.java 17 additions, 26 deletions...gent/src/main/java/eu/melodic/dlms/MetricsController.java
- dlmsAgent/src/main/java/eu/melodic/dlms/MetricsProperties.java 6 additions, 5 deletions...gent/src/main/java/eu/melodic/dlms/MetricsProperties.java
- dlmsAgent/src/main/resources/application.properties 3 additions, 0 deletionsdlmsAgent/src/main/resources/application.properties
Loading
Please register or sign in to comment