[Pkg-voip-commits] [kamailio] 01/10: Merge tag 'upstream/4.2.5'

[Victor Seva Lopez]

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

maniac-guest pushed a commit to branch master
in repository kamailio.

commit b5c9cf9182ccee0523f922ecdb814d39a937039b
Merge: afa2e2d a1f426d
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Tue May 19 19:20:45 2015 +0200

    Merge tag 'upstream/4.2.5'
    
    Upstream version 4.2.5

 .travis.yml                                     |   5 +-
 ChangeLog                                       | 475 ++++++++++++++++++++++++
 Makefile.defs                                   |   2 +-
 autover.h                                       |   4 +-
 dprint.c                                        |   2 +-
 mem/shm_mem.c                                   |   8 +
 mem/shm_mem.h                                   |   5 +
 modules/acc/acc_cdr.c                           |   4 +-
 modules/app_lua/app_lua_sr.c                    |   5 +
 modules/db_mongodb/mongodb_dbase.c              |  10 +-
 modules/dialog/dlg_handlers.c                   |   1 +
 modules/dialog/dlg_hash.c                       |  13 +-
 modules/dialog/dlg_req_within.c                 |   9 +-
 modules/evapi/evapi_dispatch.c                  |  13 +-
 modules/htable/ht_api.c                         |   3 +
 modules/imc/imc.c                               |   4 +-
 modules/nathelper/nathelper.c                   |   4 +-
 modules/ndb_mongodb/README                      |  10 +-
 modules/ndb_mongodb/doc/ndb_mongodb_admin.xml   |   2 +-
 modules/permissions/hash.c                      |   3 +-
 modules/permissions/mi.c                        |   6 +-
 modules/permissions/trusted.c                   |  21 ++
 modules/permissions/trusted.h                   |   2 +
 modules/presence/notify.c                       |   2 +-
 modules/presence/subscribe.c                    |   4 +-
 modules/presence_dialoginfo/notify_body.c       |  69 ++--
 modules/presence_xml/pres_check.c               |   5 +-
 modules/pua/add_events.c                        |   2 +-
 modules/pua/send_subscribe.c                    |   4 +-
 modules/pua_mi/mi_func.c                        |   4 +-
 modules/pv/pv_core.c                            |   6 +-
 modules/regex/regex_mod.c                       |  11 +-
 modules/rr/rr_mod.c                             |  12 +-
 modules/sctp/sctp_rpc.c                         |   4 +-
 modules/sipcapture/sipcapture.c                 |   4 +-
 modules/sqlops/sql_api.c                        |   7 +-
 modules/textops/textops.c                       |   7 +-
 modules/textopsx/textopsx.c                     |   2 +-
 modules/tls/tls_server.c                        |   4 +-
 modules/tm/h_table.h                            |   4 +-
 modules/tm/lock.c                               |  20 +-
 modules/tm/rpc_uac.c                            |   7 +-
 modules/tm/t_suspend.c                          |   9 +
 modules/tm/t_suspend.h                          |   3 -
 modules/tmx/t_mi.c                              |   4 +
 modules/uac/uac_reg.c                           |   1 +
 modules/uac_redirect/README                     |  26 +-
 modules/uac_redirect/doc/uac_redirect_admin.xml |  26 +-
 modules/usrloc/udomain.c                        |   2 +-
 pkg/kamailio/centos/6/kamailio.spec             |   2 +-
 pkg/kamailio/deb/debian/changelog               |   6 +
 pkg/kamailio/deb/jessie/changelog               |   6 +
 pkg/kamailio/deb/precise/changelog              |   6 +
 pkg/kamailio/deb/squeeze/changelog              |   6 +
 pkg/kamailio/deb/trusty/changelog               |   6 +
 pkg/kamailio/deb/wheezy/changelog               |   6 +
 pkg/kamailio/fedora/17/kamailio.spec            |   2 +-
 pkg/kamailio/rpm/kamailio.spec-4.1              |   2 +-
 pkg/kamailio/rpm/kamailio.spec.CenOS            |   2 +-
 pkg/kamailio/rpm/kamailio.spec.SuSE             |   2 +-
 sock_ut.c                                       |   6 +-
 tcp_main.c                                      |   2 +
 utils/kamctl/kamctl.sqlbase                     |   1 +
 xavp.c                                          |   7 +-
 64 files changed, 794 insertions(+), 128 deletions(-)

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