[Pkg-voip-commits] [asterisk] branch wheezy-backports updated (429c298 -> acee1f1)

[Jeremy Lainé]

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

sharky pushed a change to branch wheezy-backports
in repository asterisk.

      from  429c298   Merge branch 'master' into wheezy-backports
      adds  118dc78   Imported Upstream version 11.10.1~dfsg
      adds  6613a28   Merge tag 'upstream/11.10.1_dfsg'
      adds  daa379f   Imported Upstream version 11.10.2~dfsg
      adds  ae644bc   Merge tag 'upstream/11.10.2_dfsg'
      adds  5ac831c   prepare asterisk 11.10.2 upload
       new  acee1f1   Merge branch 'master' into wheezy-backports

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .version                      |   2 +-
 ChangeLog                     |  69 ++++++
 UPGRADE.txt                   |  13 +
 apps/app_mixmonitor.c         |   8 +-
 asterisk-11.10.0-summary.html | 400 ------------------------------
 asterisk-11.10.0-summary.txt  | 500 --------------------------------------
 asterisk-11.10.2-summary.html |  68 ++++++
 asterisk-11.10.2-summary.txt  | 103 ++++++++
 channels/chan_sip.c           |  12 +-
 configs/http.conf.sample      |   6 +
 debian/changelog              |  12 +-
 include/asterisk/tcptls.h     |  63 ++++-
 include/asterisk/utils.h      |   1 +
 main/http.c                   |  39 ++-
 main/manager.c                |  81 +++----
 main/tcptls.c                 | 553 +++++++++++++++++++++++++++++++++++-------
 main/utils.c                  |  21 +-
 res/res_http_websocket.c      |   9 +-
 18 files changed, 917 insertions(+), 1043 deletions(-)
 delete mode 100644 asterisk-11.10.0-summary.html
 delete mode 100644 asterisk-11.10.0-summary.txt
 create mode 100644 asterisk-11.10.2-summary.html
 create mode 100644 asterisk-11.10.2-summary.txt

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