Merge topic 'ASTERISK-24863'
authorMatt Jordan <mjordan@digium.com>
Fri, 17 Apr 2015 20:33:29 +0000 (15:33 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 17 Apr 2015 20:33:29 +0000 (15:33 -0500)
* changes:
  res_pjsip: Add global option to limit the maximum time for initial qualifies
  pjsip_options: Add qualify_timeout processing and eventing
  res_pjsip: Refactor endpt_send_request to include transaction timeout

1  2 
CHANGES
res/res_pjsip.c

diff --cc CHANGES
Simple merge
diff --cc res/res_pjsip.c
Simple merge