Merge pull request #4 in FKIEA/oonf-os from develop to master
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 5 Jun 2018 08:01:21 +0000 (10:01 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 5 Jun 2018 08:01:21 +0000 (10:01 +0200)
commitd592fbf75110b8aa635dca6daa92d46fe37c3478
tree68a1b32549404595c039a861ed507dece6c41201
parent6aebcf99cbce18b2ab55f4bfc7afd08d386c7fb3
parente489f97acb1922e5500317374a22c839acd0786c
Merge pull request #4 in FKIEA/oonf-os from develop to master

* commit 'e489f97acb1922e5500317374a22c839acd0786c':
  Fix compilation issue with "no-debug" logging
  Cleanup ffdat metric to be able to import rx_throughput.
  Improve combination of DAT speed and L2 throughput values
  Allow ffdat metric to consider rx_throughput field
  Fix token validation
  Improve DAT-Metric by shifting hysteresis to the loss side and consider other layer2 parameters
  Fix fixed integer arithmetics handling
  Track scaling factors of layer2 data elements. Handle different scaling for DLEP conversion.
  Fix router_id for Netjson domain output