aboutsummaryrefslogtreecommitdiffstats
path: root/apps
AgeCommit message (Collapse)AuthorFilesLines
2006-12-12manual update, since automerge is not running at this timekpfleming12-60/+169
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@48421 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-31automerge commitroot1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46680 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-30automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46427 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-19automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45711 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-13automerge commitroot1-4/+15
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45065 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-04automerge commitroot1-1/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44351 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-03automerge commitroot1-3/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44311 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-28automerge commitroot4-20/+18
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43931 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-28automerge commitroot2-3/+22
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43911 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-28automerge commitroot1-1/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43887 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27automerge commitroot1-1/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43826 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27automerge commitroot1-4/+5
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43813 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-26automerge commitroot1-2/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43720 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-25automerge commitroot1-78/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43639 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-22automerge commitroot1-92/+84
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43516 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-21automerge commitroot1-48/+47
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43421 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-19automerge commitroot3-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43280 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-19automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43255 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-18automerge commitroot1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43181 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-17automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43087 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-16automerge commitroot1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43007 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-13automerge commitroot1-4/+11
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42909 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-11automerge commitroot2-9/+27
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42787 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-08automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42440 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-08automerge commitroot1-1/+29
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42372 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-05Merged revisions 41768,41827,41830,41880,41882,41989,42014,42054 via ↵file3-41/+18
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: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42081 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-28automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41258 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-25automerge commitroot1-1/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41085 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-22automerge commitroot1-3/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40825 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-19automerge commitroot2-12/+22
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40451 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-17automerge commitroot1-3/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40253 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-15automerge commitroot1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39962 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-05automerge commitroot1-1/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38995 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-05automerge commitroot1-1/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38949 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-03automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38784 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-27automerge commitroot1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38388 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-14automerge commitroot1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37628 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-13automerge commitroot1-0/+5
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37585 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-12automerge commitroot1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37455 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-12automerge commitroot1-6/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37432 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-30automerge commitroot1-0/+134
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@36405 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-23automerge commitroot1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@35695 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-19automerge commitroot1-1/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@34950 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-19automerge commitroot1-1/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@34909 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-15automerge commitroot1-50/+50
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@34304 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-15automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@34273 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-14automerge commitroot1-74/+71
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@34192 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-14automerge commitroot2-2/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@34125 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-13automerge commitroot1-58/+55
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33868 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-13automerge commitroot2-3/+12
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33812 f38db490-d61c-443f-a65b-d21fe96a405b