merge with 3.0.1 conflicts resolved

This commit is contained in:
Dhanya Maliakal
2017-10-03 14:52:53 +02:00
20 changed files with 219 additions and 28 deletions

View File

@ -261,6 +261,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
/** set streaming source ip */
int set_streaming_source_ip();
/** set silent mode */
int set_silent_mode();
/** detector type */