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)
commitbb347fa594e195c79cbda45cb55fde3e72f90f9c
tree11f9736c7a608f6d82aa0c7da3f857bda8255168
parentfd823252e35bf54a7e5ded38cc28a60990fad5ed
parentc6ed681638f5e481001839712fe2d6d5e1fa526c
Merge topic 'ASTERISK-24863'

* 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
CHANGES
res/res_pjsip.c