diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-01-31 08:28:29 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-01-31 08:28:29 +0100 |
commit | 97e116d1747a0cca97e6e5c8871b250374ac5fc2 (patch) | |
tree | 9cd6062a1d3709ef83734f297c2b14bedaa7f461 /ChangeLog | |
parent | fa72929ad024290b7bb0b9184f9826a9de7bc052 (diff) | |
parent | 6c3bdf2987b97687a77d6555b03a61fa04277a6e (diff) | |
download | dabmux-97e116d1747a0cca97e6e5c8871b250374ac5fc2.tar.gz dabmux-97e116d1747a0cca97e6e5c8871b250374ac5fc2.tar.bz2 dabmux-97e116d1747a0cca97e6e5c8871b250374ac5fc2.zip |
Merge branch 'master' into next
Conflicts:
src/dabInputZmq.cpp
src/dabInputZmq.h
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1,6 +1,15 @@ This file contains information about the changes done to the CRC-DabMux in this repository +2014-01-32: Matthias P. Braendli <matthias@mpb.li> + (tag r11): + * crc-dabmux: + Replace TCPLog by Logger that supports syslog + Add TCP statistics server + Make ZMQ input publish buffer statistics + Add Munin helper script to graph ZMQ input stats + Fix ZMQ include when inputzmq disabled + 2014-01-05: Matthias P. Braendli <matthias@mpb.li> (tag r10): * crc-dabmux: |