[svn-commits] seanbright: branch seanbright/resolve-shadow-warnings r119466 - /team/seanbri...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri May 30 19:31:23 2008
New Revision: 119466

URL: http://svn.digium.com/view/asterisk?view=rev&rev=119466
Log:
Merged revisions 119419,119423 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r119419 | tilghman | 2008-05-30 17:23:14 -0400 (Fri, 30 May 2008) | 14 lines

Merged revisions 119404 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119404 | tilghman | 2008-05-30 16:17:45 -0500 (Fri, 30 May 2008) | 6 lines

When joinempty=strict, it only failed on join if there were busy members.  If
all members were logged out OR paused, then it (incorrectly) let callers join
the queue.
(closes issue #12451)
 Reported by: davidw

........

................
r119423 | russell | 2008-05-30 17:51:17 -0400 (Fri, 30 May 2008) | 3 lines

Fix a minor merge issue that caused a function to not get compiled in with
DEBUG_THREADS like it was supposed to

................

Modified:
    team/seanbright/resolve-shadow-warnings/   (props changed)

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 30 19:31:23 2008
@@ -1,1 +1,1 @@
-/trunk:1-119396
+/trunk:1-119465