[Pkg-voip-commits] [janus] 209/282: Merge branch 'master' into iceloop-sessions-mgmt

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit 18f61d4ddd46758e37a7b43977c84e9efcdfa97e
Merge: 4fbbcf4 11282b3
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Tue Nov 28 17:48:28 2017 +0100

    Merge branch 'master' into iceloop-sessions-mgmt

 Makefile.am                                    |  10 +
 README.md                                      |   7 +-
 bower.json                                     |   4 +-
 certs/README.md                                |   6 +-
 conf/janus.eventhandler.rabbitmqevh.cfg.sample |  26 +
 conf/janus.plugin.videoroom.cfg.sample         |   6 +-
 conf/janus.transport.rabbitmq.cfg.sample       |   1 +
 configure.ac                                   |  47 +-
 dtls-bio.c                                     |  18 +-
 dtls-bio.h                                     |   7 +
 dtls.c                                         |   6 +-
 events.c                                       |   8 +-
 events.h                                       |   3 +-
 events/janus_rabbitmqevh.c                     | 751 +++++++++++++++++++++++++
 html/janus.js                                  |   9 +-
 html/videoroomtest.html                        |   2 +-
 html/videoroomtest.js                          |  10 +
 ice.c                                          |  18 +-
 janus.c                                        |   5 +-
 mainpage.dox                                   |   5 +
 plugins/janus_audiobridge.c                    |   1 +
 plugins/janus_nosip.c                          |   4 +
 plugins/janus_sip.c                            |   4 +
 plugins/janus_sipre.c                          |   4 +
 plugins/janus_streaming.c                      |  64 ++-
 plugins/janus_videoroom.c                      | 604 ++++++++++++++------
 postprocessing/janus-pp-rec.c                  |  34 +-
 rtp.c                                          |  38 +-
 rtp.h                                          |   3 +-
 sdp.c                                          |  41 +-
 transports/janus_pfunix.c                      |   6 +-
 transports/janus_rabbitmq.c                    |  34 +-
 transports/janus_websockets.c                  |   2 +
 33 files changed, 1518 insertions(+), 270 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git