Commits · 5fe104ddb9cf4b19513c7fb78f3b4e282e8e519e · Voice / asterisk

Aug 09, 2011

Merged revisions 331143 via svnmerge from · 5fe104dd

Jason Parker authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331143 | qwell | 2011-08-09 10:59:54 -0500 (Tue, 09 Aug 2011) | 9 lines
  
  Merged revisions 331142 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331142 | qwell | 2011-08-09 10:58:16 -0500 (Tue, 09 Aug 2011) | 1 line
    
    Regenerate asterisk man page from sgml.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331144 65c4cc65-6c06-0410-ace0-fbb531ad65f3

5fe104dd

Merged revisions 331139 via svnmerge from · 873962f7

Jason Parker authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331139 | qwell | 2011-08-09 10:50:07 -0500 (Tue, 09 Aug 2011) | 19 lines
  
  Merged revisions 306999 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r306999 | lathama | 2011-02-08 14:22:35 -0600 (Tue, 08 Feb 2011) | 12 lines
    
    Documentation Updates
    
    Note default polling setting in voicemail.conf
    Add missing config to asterisk.conf
    Update manpage
    
    (issue #16505)
    Reported by: tzafrir
    Patches: 
          asterisk_sgml_fixes_demo.diff uploaded by tzafrir (license 46)
    Tested by: lathama, tzafrir
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331141 65c4cc65-6c06-0410-ace0-fbb531ad65f3

873962f7

Merged revisions 331138 via svnmerge from · 19c82788

Jason Parker authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331138 | qwell | 2011-08-09 10:47:20 -0500 (Tue, 09 Aug 2011) | 1 line
  
  Revert merge of r306999, due to merge conflict.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331140 65c4cc65-6c06-0410-ace0-fbb531ad65f3

19c82788

Aug 08, 2011

Merged revisions 331097 via svnmerge from · 16acfefa

Terry Wilson authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331097 | twilson | 2011-08-08 17:59:01 -0500 (Mon, 08 Aug 2011) | 5 lines
  
  Bump the AMI protocol version to 1.2
  
  As a result of converting Unlink events that were missed in the AMI
  1.1 update to Bridge events, the AMI protocol version is being incremented.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331098 65c4cc65-6c06-0410-ace0-fbb531ad65f3

16acfefa

Merged revisions 331041 via svnmerge from · 5901f2d0

Terry Wilson authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331041 | twilson | 2011-08-08 16:12:51 -0500 (Mon, 08 Aug 2011) | 6 lines
  
  Replace AMI Unlink events with Bridge events
  
  A previous update converted some of the Link and Unlink events to
  Bridge events, but a couple of Unlink events were missed. This patch
  rectifies the situation.

  (closes issues ASTERISK-17455)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331042 65c4cc65-6c06-0410-ace0-fbb531ad65f3

5901f2d0

Merged revisions 331039 via svnmerge from · 38efff0c

Kinsey Moore authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331039 | kmoore | 2011-08-08 15:53:30 -0500 (Mon, 08 Aug 2011) | 18 lines
  
  Merged revisions 331038 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331038 | kmoore | 2011-08-08 15:52:45 -0500 (Mon, 08 Aug 2011) | 11 lines
    
    In-queue MOH stops after a periodic announcement
    
    If the seek value is past the end of file when resuming G.722 MOH, MOH will
    cease to function for the duration of the MOH session through all starts and
    stops until saved state is cleared.  Adjusting the code to guarantee a single
    valid read (which is already assumed) fixes the bug.
    
    (closes issue ASTERISK-18077)
    Review: https://reviewboard.asterisk.org/r/1328/


Tested-by: Jonathan Rose <jrose@digium.com>
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331040 65c4cc65-6c06-0410-ace0-fbb531ad65f3

38efff0c

Log queue member name when state_interface is set for ADDMEMBER and REMOVEMEMBER events · 0f5ef2c7

Kinsey Moore authored 13 years ago

app_queue logs the events ADDMEMBER and REMOVEMEMBER with the agent field set
to the interface value rather than the membername value when a member is added
with a state_interface value set.  However all other member related queue
events are logged with the membername when a state_interface is set.  This
patch makes these fields optionally more consistent and correct.

(closes issue ASTERISK-14769)
Review: https://reviewboard.asterisk.org/r/1286


Patch-by: Jamuel Starkey
Tested-by: Kinsey Moore <kmoore@digium.com>


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331037 65c4cc65-6c06-0410-ace0-fbb531ad65f3

0f5ef2c7

app_queue: Add StateInterface to output of "queue show" and "QueueStatus" · d1a0938c

Kinsey Moore authored 13 years ago

This patch adds the state_interface of the queue member struct to the output
of "queue show" (CLI command) and "QueueStatus" (AMI action) when displaying
relevant queue member information.  For the AMI event message the variable
StateInterface has been added.

(closes issue ASTERISK-18071)
Review: https://reviewboard.asterisk.org/r/1300/
Patch-by: Jamuel Starkey


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331000 65c4cc65-6c06-0410-ace0-fbb531ad65f3

d1a0938c

Aug 05, 2011

Merged revisions 330940 via svnmerge from · 80a4611f

David Vossel authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r330940 | dvossel | 2011-08-05 10:53:49 -0500 (Fri, 05 Aug 2011) | 2 lines
  
  The slin resampler is no longer dependent on an external library, but the dependency was not removed correctly.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330941 65c4cc65-6c06-0410-ace0-fbb531ad65f3

80a4611f

Merged revisions 330899 via svnmerge from · 872e0411

Alexandr Anikin authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330899 | may | 2011-08-05 11:38:28 +0400 (Fri, 05 Aug 2011) | 11 lines
  
  Merged revisions 330827 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330827 | may | 2011-08-04 23:37:16 +0400 (Thu, 04 Aug 2011) | 4 lines
    
    change gk client behaivour on rrq/grq failures to setup timers
    and next tries after timeout instead of complete failure in the ooh323
    stack
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330903 65c4cc65-6c06-0410-ace0-fbb531ad65f3

872e0411

Aug 04, 2011

Merged revisions 330844 via svnmerge from · 72eba1af

Terry Wilson authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330844 | twilson | 2011-08-04 15:51:23 -0500 (Thu, 04 Aug 2011) | 11 lines
  
  Merged revisions 330843 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330843 | twilson | 2011-08-04 15:29:19 -0500 (Thu, 04 Aug 2011) | 4 lines
    
    Make libsrtp instructions more explicit when linking fails
    
    (closes issue ASTERISK-18139)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330845 65c4cc65-6c06-0410-ace0-fbb531ad65f3

72eba1af

Aug 03, 2011

Merged revisions 330763 via svnmerge from · 276c7954

Kinsey Moore authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330763 | kmoore | 2011-08-03 10:15:26 -0500 (Wed, 03 Aug 2011) | 16 lines
  
  Merged revisions 330762 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330762 | kmoore | 2011-08-03 10:14:36 -0500 (Wed, 03 Aug 2011) | 9 lines
    
    editing files in main/editline does not ensure rebuild of libedit.a
    
    When editing a source file in main/editline, the build system does not rebuild
    libedit.a and uses the already existing one instead.  Adding a PHONY to
    CHECK_SUBDIR fixes this problem.
    
    (closes issue ASTERISK-16221)
    Patch-by: Walter Doekes
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330764 65c4cc65-6c06-0410-ace0-fbb531ad65f3

276c7954

Merged revisions 330706 via svnmerge from · db3d1134

Kinsey Moore authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330706 | kmoore | 2011-08-03 08:39:06 -0500 (Wed, 03 Aug 2011) | 17 lines
  
  Merged revisions 330705 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330705 | kmoore | 2011-08-03 08:38:17 -0500 (Wed, 03 Aug 2011) | 10 lines
    
    Call pickup broken for DAHDI channels when beginning with #
    
    The call pickup feature did not work on DAHDI devices for anything other than
    feature codes beginning with * since all feature codes in chan_dahdi were
    originally hard-coded to begin with *.  This patch is also applied to
    chan_dahdi.c to fix this bug with radio modes.
    
    (closes issue AST-621)
    Review: https://reviewboard.asterisk.org/r/1336/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330707 65c4cc65-6c06-0410-ace0-fbb531ad65f3

db3d1134

Aug 02, 2011

Merged revisions 330649 via svnmerge from · ed6ac735

Kevin P. Fleming authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330649 | kpfleming | 2011-08-02 15:52:44 -0500 (Tue, 02 Aug 2011) | 9 lines
  
  Merged revisions 330648 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330648 | kpfleming | 2011-08-02 15:51:56 -0500 (Tue, 02 Aug 2011) | 2 lines
    
    Convert an error message to actually be helpful.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330650 65c4cc65-6c06-0410-ace0-fbb531ad65f3

ed6ac735

Merged revisions 330586 via svnmerge from · e128ee25

David Vossel authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330586 | dvossel | 2011-08-02 11:17:59 -0500 (Tue, 02 Aug 2011) | 15 lines
  
  Merged revisions 330581 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330581 | dvossel | 2011-08-02 11:15:08 -0500 (Tue, 02 Aug 2011) | 8 lines
    
    Fixes crash in chan_iax2.
    
    Fixes crash in chan_iax2 resulting from an edge case in the
    way control frames are queued during calltoken negotiation is complete.
    
    (closes issue ASTERISK-17610)
    Reported by: mgrobecker
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330593 65c4cc65-6c06-0410-ace0-fbb531ad65f3

e128ee25

Merged revisions 330579 via svnmerge from · 6f112cce

David Vossel authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330579 | dvossel | 2011-08-02 11:08:57 -0500 (Tue, 02 Aug 2011) | 9 lines
  
  Merged revisions 330578 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330578 | dvossel | 2011-08-02 11:07:02 -0500 (Tue, 02 Aug 2011) | 2 lines
    
    Optimization to buffer initialization fix.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330580 65c4cc65-6c06-0410-ace0-fbb531ad65f3

6f112cce

Merged revisions 330576 via svnmerge from · d50e68c8

David Vossel authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330576 | dvossel | 2011-08-02 10:55:36 -0500 (Tue, 02 Aug 2011) | 12 lines
  
  Merged revisions 330575 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330575 | dvossel | 2011-08-02 10:53:21 -0500 (Tue, 02 Aug 2011) | 5 lines
    
    Fixes uninitialized string buffer in log message.
    
    (closes issue ASTERISK-17200)
    Reported by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330577 65c4cc65-6c06-0410-ace0-fbb531ad65f3

d50e68c8

Aug 01, 2011

Blocked revisions 330514 via svnmerge · 4e1b07f2

Jonathan Rose authored 13 years ago

................
  r330514 | jrose | 2011-08-01 16:21:23 -0500 (Mon, 01 Aug 2011) | 14 lines
  
  Blocked revisions 330510 via svnmerge
  
  ................
    r330510 | jrose | 2011-08-01 16:20:40 -0500 (Mon, 01 Aug 2011) | 8 lines
    
    Blocked revisions 330505 via svnmerge
    
    ........
      r330505 | jrose | 2011-08-01 16:19:47 -0500 (Mon, 01 Aug 2011) | 3 lines
      
      fixes reference leak pointed out by rmudgett in https://reviewboard.asterisk.org/r/1337/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330518 65c4cc65-6c06-0410-ace0-fbb531ad65f3

4e1b07f2

Blocked revisions 330492 via svnmerge · 5e1a744a

Jonathan Rose authored 13 years ago

................
  r330492 | jrose | 2011-08-01 16:10:35 -0500 (Mon, 01 Aug 2011) | 24 lines
  
  Blocked revisions 330491 via svnmerge
  
  ................
    r330491 | jrose | 2011-08-01 16:09:15 -0500 (Mon, 01 Aug 2011) | 18 lines
    
    Blocked revisions 330490 via svnmerge
    
    ........
      r330490 | jrose | 2011-08-01 16:08:10 -0500 (Mon, 01 Aug 2011) | 12 lines
      
      Asterisk 18103 - Fix reload crash caused by destroying default parking lot
      
      Default parking lot was being destroyed in reload and was not being rebuilt properly.
      This patch keeps features.c reload from destroying the default parking lot in 1.6.2.
      Bug was caused by a hasty backport which didn't test reload enough times to catch the
      problem.
      
      (Closes Issue ASTERISK-18103)
      Reported by: 808blogger
      
      Review: https://reviewboard.asterisk.org/r/1337/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330493 65c4cc65-6c06-0410-ace0-fbb531ad65f3

5e1a744a

Merged revisions 330434 via svnmerge from · dc8df80e

Kinsey Moore authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330434 | kmoore | 2011-08-01 10:23:29 -0500 (Mon, 01 Aug 2011) | 16 lines
  
  Merged revisions 330433 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330433 | kmoore | 2011-08-01 10:22:10 -0500 (Mon, 01 Aug 2011) | 9 lines
    
    Incorrect playback for Spanish in some circumstances
    
    When you say the time in spanish and it is 01:00 - 01:59 or 13:00 - 13:59 you
    must use female pronunciation "1F". The function "say_date_with_format_es" does
    not take this in account.
    
    (closes ASTERISK-15016)
    Patch-by: Luis Jimenez
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330435 65c4cc65-6c06-0410-ace0-fbb531ad65f3

dc8df80e

Jul 31, 2011

Fixed compiler warning and a couple prototype mismatches. · 6cf345e0
Richard Mudgett authored 13 years ago
```
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
```
6cf345e0

Merged revisions 330369 via svnmerge from · a5be6a0f

Richard Mudgett authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330369 | rmudgett | 2011-07-30 18:57:56 -0500 (Sat, 30 Jul 2011) | 11 lines
  
  Merged revisions 330368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330368 | rmudgett | 2011-07-30 18:56:29 -0500 (Sat, 30 Jul 2011) | 4 lines
    
    Remove some redundant locking code in ast_do_masquerade().
    
    Also updated some comments.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330370 65c4cc65-6c06-0410-ace0-fbb531ad65f3

a5be6a0f

Jul 30, 2011

Merged revisions 330312 via svnmerge from · 1c007828

Gregory Nietsky authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330312 | irroot | 2011-07-30 17:34:41 +0200 (Sat, 30 Jul 2011) | 15 lines
  
  Merged revisions 330311 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330311 | irroot | 2011-07-30 17:25:16 +0200 (Sat, 30 Jul 2011) | 9 lines
    
    prevent double masqurading channels when one is been hung up and deadlock avoidance is used.
    
    There is a race condition in ast_do_masquerade / ast_hangup (at least)
    
    Reported by me signed off by schmidts with input from David Vossel
    
    Review: https://reviewboard.asterisk.org/r/1323/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330313 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1c007828

Jul 29, 2011

astobj2: Avoid using temporary objects + ao2_find() with OBJ_POINTER. · 6a15e95a

Russell Bryant authored 13 years ago

There is a fairly common pattern making its way through the code base where we
put a temporary object on the stack so we can call ao2_find() with OBJ_POINTER.
The purpose is so that it can be passed into the object hash function.
However, this really seems like a hack and potentially error prone. This patch
is a first stab at approach to avoid having to do that.

It adds a new flag, OBJ_KEY, which can be used instead of OBJ_POINTER in these
situations. Then, the hash function can know whether it was given an object or
some custom data to hash.

The patch also changes some uses of ao2_find() for iax2_user and iax2_peer
objects to reflect how OBJ_KEY would be used.

So long, and thanks for all the fish.

Review: https://reviewboard.asterisk.org/r/1184/

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330273 65c4cc65-6c06-0410-ace0-fbb531ad65f3

6a15e95a

Merged revisions 330217 via svnmerge from · d2ed4ed5

Sean Bright authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330217 | seanbright | 2011-07-29 13:19:42 -0400 (Fri, 29 Jul 2011) | 9 lines
  
  Merged revisions 330213 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330213 | seanbright | 2011-07-29 13:18:56 -0400 (Fri, 29 Jul 2011) | 2 lines
    
    Correct the check for O_RDONLY.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330221 65c4cc65-6c06-0410-ace0-fbb531ad65f3

d2ed4ed5

Merged revisions 330204 via svnmerge from · 4e1fe6cc

Sean Bright authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330204 | seanbright | 2011-07-29 12:58:40 -0400 (Fri, 29 Jul 2011) | 9 lines
  
  Merged revisions 330203 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330203 | seanbright | 2011-07-29 12:58:08 -0400 (Fri, 29 Jul 2011) | 2 lines
    
    Only write to wav files that were opened to be written to.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330205 65c4cc65-6c06-0410-ace0-fbb531ad65f3

4e1fe6cc

Merged revisions 330162 via svnmerge from · b6a9795b

Paul Belanger authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r330162 | pabelanger | 2011-07-29 01:25:18 -0400 (Fri, 29 Jul 2011) | 4 lines
  
  Fix typo pointed out on #asterisk
  
  Thanks notten
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330163 65c4cc65-6c06-0410-ace0-fbb531ad65f3

b6a9795b

Jul 28, 2011

Merged revisions 330108 via svnmerge from · be38ebe3

Terry Wilson authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330108 | twilson | 2011-07-28 16:44:31 -0500 (Thu, 28 Jul 2011) | 9 lines
  
  Merged revisions 330107 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330107 | twilson | 2011-07-28 16:42:41 -0500 (Thu, 28 Jul 2011) | 2 lines
    
    Make console colors work for TERM=xterm-256color
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330109 65c4cc65-6c06-0410-ace0-fbb531ad65f3

be38ebe3

Merged revisions 330051 via svnmerge from · a3ba55e7

Richard Mudgett authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330051 | rmudgett | 2011-07-28 12:10:37 -0500 (Thu, 28 Jul 2011) | 29 lines
  
  Merged revisions 330050 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ................
    r330050 | rmudgett | 2011-07-28 12:04:24 -0500 (Thu, 28 Jul 2011) | 22 lines
    
    Merged revisions 330033 from
    https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
    
    ..........
      r330033 | rmudgett | 2011-07-28 11:26:38 -0500 (Thu, 28 Jul 2011) | 15 lines
    
      Datacalls with B410P fail.
    
      Incoming and outgoing call legs of a data call are using different
      formats: a-law, u-law.  When the call is bridged, the media stream is run
      through translation to convert the media formats.  The translation is bad
      for data calls.
    
      * Make incoming call that does not explicitly specify u-law or a-law use
      the DAHDI channel's default law.  The outgoing call always uses the
      default law from the DAHDI channel.
    
      (closes issue ABE-2800)
      Patches:
    	jira_abe_2800_companding.patch (license #5621) patch uploaded by rmudgett
    ..........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

a3ba55e7

Merged revisions 329995 via svnmerge from · 16a32f50

Jason Parker authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329995 | qwell | 2011-07-28 10:45:49 -0500 (Thu, 28 Jul 2011) | 13 lines
  
  Merged revisions 329994 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329994 | qwell | 2011-07-28 10:45:24 -0500 (Thu, 28 Jul 2011) | 6 lines
    
    Fix a SIP transfer deadlock.
    
    The locking in this function is very scary.  There are like 6 structs involved.
    
    (closes issue AST-470)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329996 65c4cc65-6c06-0410-ace0-fbb531ad65f3

16a32f50

Merged revisions 329992 via svnmerge from · b05b37dc

Matthew Nicholson authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329992 | mnicholson | 2011-07-28 10:28:21 -0500 (Thu, 28 Jul 2011) | 13 lines
  
  Merged revisions 329991 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329991 | mnicholson | 2011-07-28 10:26:56 -0500 (Thu, 28 Jul 2011) | 6 lines
    
    check for CONFIG_STATUS_FILE_INVALID when loading the res_fax config file
    
    Patch by: tzafrir
    Reported by: tzafrir
    (closes issue ASTERISK-18161)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329993 65c4cc65-6c06-0410-ace0-fbb531ad65f3

b05b37dc

Merged revisions 329952 via svnmerge from · f90bb00e

Sean Bright authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329952 | seanbright | 2011-07-28 09:03:58 -0400 (Thu, 28 Jul 2011) | 4 lines
  
  The default conf-usermenu says that '8' can be used to leave the conference, so
  put that in the sample user menu.  '5' is supposed to extend the conference, but
  there doesn't appear to be a concept of that in the menu actions.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329953 65c4cc65-6c06-0410-ace0-fbb531ad65f3

f90bb00e

Merged revisions 329950 via svnmerge from · d4e239fa

Sean Bright authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329950 | seanbright | 2011-07-28 08:43:55 -0400 (Thu, 28 Jul 2011) | 1 line
  
  Correct the spelling of 'conference.'
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

d4e239fa

Merged revisions 329896 via svnmerge from · 73462b32

Sean Bright authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329896 | seanbright | 2011-07-28 07:35:27 -0400 (Thu, 28 Jul 2011) | 9 lines
  
  Merged revisions 329895 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329895 | seanbright | 2011-07-28 07:34:33 -0400 (Thu, 28 Jul 2011) | 2 lines
    
    Make the output of Externhost in 'sip show settings' more consistent.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329897 65c4cc65-6c06-0410-ace0-fbb531ad65f3

73462b32

Jul 27, 2011

reverting 329840 due to failing tests. Going to change this feature to be purely optional. · d170e5e8
Jonathan Rose authored 13 years ago
```
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
```
d170e5e8

Adds cdr logging of calls resulting in CONGESTION · 3ee80d6a

Jonathan Rose authored 13 years ago

Applies a patch made a long time ago by alecdavis which adds a CDR feature for logging
calls that failed due to congestion.

(closes issue #15907)
Reported by: alecdavis
Patches: 
      cdr_congestion.diff.txt uploaded by alecdavis (license #5546)

Review: https://reviewboard.asterisk.org/r/454/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329835 65c4cc65-6c06-0410-ace0-fbb531ad65f3

3ee80d6a

Merged revisions 329771 via svnmerge from · 1e332468

Sean Bright authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329771 | seanbright | 2011-07-27 15:18:47 -0400 (Wed, 27 Jul 2011) | 15 lines
  
  Merged revisions 329767 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329767 | seanbright | 2011-07-27 15:17:46 -0400 (Wed, 27 Jul 2011) | 8 lines
    
    Explicitly sort the module list so that the menuselect lists are sorted.
    
    (closes ASTERISK-18141)
    Reported by: Richard Miller
    Patches:
    		sort-order.diff uploaded by seanbright (License #5060)
    Tested by: leifmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1e332468

Merged revisions 329710 via svnmerge from · 67acd8cb

Jonathan Rose authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329710 | jrose | 2011-07-27 13:11:07 -0500 (Wed, 27 Jul 2011) | 14 lines
  
  Merged revisions 329709 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329709 | jrose | 2011-07-27 13:10:30 -0500 (Wed, 27 Jul 2011) | 8 lines
    
    Fix New Zealand indications profile based on http://www.telepermit.co.nz/TNA102.pdf
    
    (closes issue ASTERISK-16263)
    Reported by: richardf
    Patches: 
          nz-indications.patch uploaded by richardf (License #6015)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329711 65c4cc65-6c06-0410-ace0-fbb531ad65f3

67acd8cb

Merged revisions 329670 via svnmerge from · 5858e755

Sean Bright authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329670 | seanbright | 2011-07-27 11:25:53 -0400 (Wed, 27 Jul 2011) | 2 lines
  
  Sort the module list so that 'module show' is alphabetical.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329671 65c4cc65-6c06-0410-ace0-fbb531ad65f3

5858e755

Merged revisions 329614 via svnmerge from · 353bcc99

Tilghman Lesher authored 13 years ago

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329614 | tilghman | 2011-07-26 23:25:26 -0500 (Tue, 26 Jul 2011) | 13 lines
  
  Merged revisions 329613 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329613 | tilghman | 2011-07-26 23:23:46 -0500 (Tue, 26 Jul 2011) | 6 lines
    
    Duration and billsec are swapped in high resolution time.
    
    Closes ASTERISK-18024
    Patches:
    	20110726__ASTERISK-18024.diff by Tilghman Lesher (License 5003)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329615 65c4cc65-6c06-0410-ace0-fbb531ad65f3

353bcc99