Merge "res/res_ari: Added ARI resource /ari/channels/{channelId}/rtp_statistics"

author George Joseph <gjoseph@digium.com>

Mon, 8 Apr 2019 15:51:45 +0000 (10:51 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Mon, 8 Apr 2019 15:51:45 +0000 (10:51 -0500)
author George Joseph <gjoseph@digium.com>
Mon, 8 Apr 2019 15:51:45 +0000 (10:51 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 8 Apr 2019 15:51:45 +0000 (10:51 -0500)
diff --cc main/rtp_engine.c
Simple merge
diff --cc res/ari/ari_model_validators.c
Simple merge
diff --cc res/ari/ari_model_validators.h
Simple merge
diff --cc rest-api/api-docs/channels.json
Simple merge
author	George Joseph <gjoseph@digium.com>
	Mon, 8 Apr 2019 15:51:45 +0000 (10:51 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 8 Apr 2019 15:51:45 +0000 (10:51 -0500)
		1	2
main/rtp_engine.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/ari/ari_model_validators.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/ari/ari_model_validators.h	patch \|	diff1 \|	diff2 \|	blob \| history
rest-api/api-docs/channels.json	patch \|	diff1 \|	diff2 \|	blob \| history