Automerge Script
ac96ab8b01
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49865 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-07 22:09:13 +00:00
Automerge Script
b99c6b0329
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-04 17:58:59 +00:00
Automerge Script
8672b596af
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-04 17:09:25 +00:00
Automerge Script
e42fdeeea1
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-04 00:09:00 +00:00
Automerge Script
8e36da5699
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-20 20:11:07 +00:00
Kevin P. Fleming
05f6188c69
manual update, since automerge is not running at this time
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-12 22:58:49 +00:00
Automerge script
830d07c933
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-31 16:02:51 +00:00
Automerge script
5c99f456a9
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-30 15:03:50 +00:00
Automerge script
2a0b7672d2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-19 18:02:35 +00:00
Automerge script
0485f6b149
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 17:02:15 +00:00
Automerge script
029b67fd32
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 16:05:59 +00:00
Automerge script
41c63cf7f5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-03 21:02:12 +00:00
Automerge script
ae1a27ae61
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 18:01:52 +00:00
Automerge script
93efe68235
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 17:01:35 +00:00
Automerge script
3da0f0e59d
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 16:01:36 +00:00
Automerge script
2b76e9e216
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 21:01:34 +00:00
Automerge script
854e0369df
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 20:01:41 +00:00
Automerge script
4c6fb3dd37
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-26 21:01:50 +00:00
Automerge script
1de86fd7fc
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-25 22:00:50 +00:00
Automerge script
c5056e1736
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-22 22:01:20 +00:00
Automerge script
bb63a367e3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-21 17:01:53 +00:00
Automerge script
e2354a5244
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 17:01:01 +00:00
Automerge script
9ae33412c5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 13:01:18 +00:00
Automerge script
8911aced89
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18 16:02:39 +00:00
Automerge script
1e4fd6f9b5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-17 14:02:31 +00:00
Automerge script
0d4e8df3d6
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-16 05:00:50 +00:00
Automerge script
3f4ef02de2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-13 20:02:40 +00:00
Automerge script
cb1e08addc
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-11 22:00:50 +00:00
Automerge script
1134ad9412
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-08 17:03:06 +00:00
Automerge script
6f41dcb8a3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-08 00:02:42 +00:00
Joshua Colp
6480d28862
Merged revisions 41768,41827,41830,41880,41882,41989,42014,42054 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r41768 | file | 2006-09-01 18:49:07 -0400 (Fri, 01 Sep 2006) | 2 lines
Only wipe the redirected audio & video IP/port if it's specified, and trigger a reinvite.
........
r41827 | bweschke | 2006-09-03 10:16:08 -0400 (Sun, 03 Sep 2006) | 3 lines
Setting a retry of 0 is generally not a good idea and shouldn't be allowed. (#7574 - reported by regin)
........
r41830 | bweschke | 2006-09-03 10:50:59 -0400 (Sun, 03 Sep 2006) | 3 lines
Let's NOT spy on Zap/psuedo channels, mmmmmmmmk?
........
r41880 | bweschke | 2006-09-03 13:13:38 -0400 (Sun, 03 Sep 2006) | 3 lines
Don't keep trying the same member in certain strategies when members of the queue are unavailable (#7278 - diLLec reported and patched) - This should have been patched here first and then merged into /trunk. My bad!
........
r41882 | bweschke | 2006-09-03 13:38:22 -0400 (Sun, 03 Sep 2006) | 3 lines
Make sure the forwarded channel inherits variables appropriately when we receive a call forward in the queue. (#7867 - raarts reported and patched)
........
r41989 | oej | 2006-09-04 11:46:07 -0400 (Mon, 04 Sep 2006) | 2 lines
Don't kill the pvt before we have sent ACK on CANCEL (needs more testing before making a release)
........
r42014 | qwell | 2006-09-05 12:27:46 -0400 (Tue, 05 Sep 2006) | 4 lines
Small typo in zapata.conf.sample
Reported by ppyy in 7881
........
r42054 | file | 2006-09-05 16:02:48 -0400 (Tue, 05 Sep 2006) | 2 lines
Merge in last round of spy fixes. This should hopefully eliminate all the issues people have been seeing by distinctly separating what each component (core/spy) is responsible for. Core is responsible for adding a spy to a channel, feeding frames to the spy, removing the spy from a channel, and telling the spy to stop. Spy is responsible for reading frames in, and cleaning up after itself.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-05 23:48:48 +00:00
Automerge script
a37739a0d9
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-28 21:02:56 +00:00
Automerge script
53a30e84eb
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-25 16:02:33 +00:00
Automerge script
65d8d50962
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-22 03:00:53 +00:00
Automerge script
38504cba52
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-19 01:04:07 +00:00
Automerge script
1e38d97c40
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-17 17:04:18 +00:00
Automerge script
8c1e784711
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-15 23:04:36 +00:00
Automerge script
76f5300793
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-05 09:03:31 +00:00
Automerge script
e91c55a99d
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-05 07:03:24 +00:00
Automerge script
03a63f510a
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38784 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-03 06:03:31 +00:00
Automerge script
e076d9d41f
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-27 23:02:39 +00:00
Automerge script
0aaae9f118
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-14 14:02:33 +00:00
Automerge script
a2be0f0c4a
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-13 22:02:15 +00:00
Automerge script
afb25c2c40
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 16:02:19 +00:00
Automerge script
94755549d7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 14:02:32 +00:00
Automerge script
77d5bacce8
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-30 15:04:39 +00:00
Automerge script
031b53f451
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@35695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-23 12:04:14 +00:00
Automerge script
1386fb291b
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-19 21:05:53 +00:00
Automerge script
d9cfa818c4
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-19 19:04:53 +00:00
Automerge script
a98f0bf56d
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-15 14:04:55 +00:00
