[svn-commits] pabelanger: branch pabelanger/localhostBindaddr r996 - in /asterisk/team/pabe...

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Sun Nov 28 16:01:45 2010
New Revision: 996

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=996
Log:
resync and automerge

Modified:
    asterisk/team/pabelanger/localhostBindaddr/   (props changed)
    asterisk/team/pabelanger/localhostBindaddr/tests/chanspy/tests.yaml
    asterisk/team/pabelanger/localhostBindaddr/tests/tests.yaml

Propchange: asterisk/team/pabelanger/localhostBindaddr/
------------------------------------------------------------------------------
    automerge = *

Propchange: asterisk/team/pabelanger/localhostBindaddr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:01:45 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:974-977
+/asterisk/trunk:974-977,992-993

Propchange: asterisk/team/pabelanger/localhostBindaddr/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Nov 28 16:01:45 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-990
+/asterisk/trunk:1-990,992-993

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/chanspy/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/chanspy/tests.yaml?view=diff&rev=996&r1=995&r2=996
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/chanspy/tests.yaml (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/chanspy/tests.yaml Sun Nov 28 16:01:45 2010
@@ -1,5 +1,4 @@
 # Enter tests here in the order they should be considered for execution:
 tests:
     # Temporarily disabled while failures are debugged
-    - test: 'chanspy_barge'
-    - test: 'chanspy_w_mixmonitor'
+    #- test: 'chanspy_barge'

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/tests.yaml?view=diff&rev=996&r1=995&r2=996
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/tests.yaml (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/tests.yaml Sun Nov 28 16:01:45 2010
@@ -32,7 +32,7 @@
     #- test: 'mixmonitor'
     # Temporarily disabled while failures are debugged
     #- test: 'mixmonitor_audiohook_inherit'
-    - dir: 'chanspy'
+    #- dir: 'chanspy'
     - dir: 'queues'
     - dir: 'fastagi'
     - dir: 'pbx'