Merge SRS4

README.md

@@ -5,8 +5,8 @@
 [![](https://codecov.io/gh/ossrs/srs/branch/develop/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/develop)
 [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
 
-SRS/4.0，[Leo][release4]，是一个流媒体直播集群，高效、稳定、易用，简单而快乐。<br/>
-SRS(Simple RTMP Server) is a live streaming cluster, high efficiency, stable and simple.
+SRS/4.0，[Leo][release4]，是一个流媒体集群，支持RTMP/HLS/WebRTC/SRT/GB28181，高效、稳定、易用，简单而快乐。<br/>
+SRS is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple.
 
 > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing].
 
@@ -325,7 +325,6 @@ For previous versions, please read:
 * v3.0, 2016-12-15, fix [#717][bug #717], [#691][bug #691], http api/static/stream support cors. 3.0.9
 * v3.0, 2016-12-08, Fix [#105][bug #105], support log rotate signal SIGUSR1. 3.0.8
 * v3.0, 2016-12-07, fix typo and refine grammar. 3.0.7
-* v3.0, 2015-10-23, fix [#467][bug #467], support write log to kafka. 3.0.6
 * v3.0, 2015-10-20, fix [#502][bug #502], support snapshot with http-callback or transcoder. 3.0.5
 * v3.0, 2015-09-19, support amf0 and json to convert with each other.
 * v3.0, 2015-09-19, json objects support dumps to string.

trunk/conf/full.conf

@@ -325,25 +325,6 @@ rtc {
     candidate       *;
 }
 
-#############################################################################################
-# Kafka sections
-#############################################################################################
-# Apache Kafka is a high-throughput distributed messaging system.
-# SRS is a Kafka producer to send message to kafka.
-# @see https://kafka.apache.org/documentation.html#introduction
-kafka {
-    # whether enabled kafka.
-    # default: off
-    enabled         off;
-    # the broker list, broker is <ip:port>
-    # and use space to specify multple brokers.
-    # for example, 127.0.0.1:9092 127.0.0.1:9093
-    brokers         127.0.0.1:9092;
-    # the kafka topic to use.
-    # default: srs
-    topic           srs;
-}
-
 #############################################################################################
 # RTMP/HTTP VHOST sections
 #############################################################################################

trunk/scripts/install.sh

@@ -23,7 +23,7 @@ ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
 # check lsb_release
 ok_msg "check tools"
 lsb_release -v >/dev/null 2>&1; ret=$?
-if [[ $ret -ne 0 ]]; then failed_msg "abort, please install lsb_release"; exit $ret; fi
+if [[ $ret -ne 0 ]]; then failed_msg "no lsb_release, install: yum install -y redhat-lsb"; exit $ret; fi
 
 # user must stop service first.
 ok_msg "check previous install"