[asterisk-commits] mmichelson: branch mmichelson/phone-testsuite r3221 - in /asterisk/team/mmich...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon May 14 17:01:10 2012
New Revision: 3221

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3221
Log:
Resolve conflict and reset automerge.


Added:
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/configs/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/configs/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/configs/ast1/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/configs/ast1/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/configs/ast1/extensions.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/configs/ast1/extensions.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/configs/ast1/sip.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/configs/ast1/sip.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/configs/ast2/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/configs/ast2/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/configs/ast2/extensions.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/configs/ast2/extensions.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/configs/ast2/sip.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/configs/ast2/sip.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/run-test
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/run-test
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/hangupcause/test-config.yaml
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/hangupcause/test-config.yaml
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/configs/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/configs/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/configs/ast1/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/configs/ast1/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/configs/ast1/extensions.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/configs/ast1/extensions.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/configs/ast1/sip.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/configs/ast1/sip.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/configs/ast2/
      - copied from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/configs/ast2/
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/configs/ast2/extensions.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/configs/ast2/extensions.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/configs/ast2/sip.conf
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/configs/ast2/sip.conf
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/run-test
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/run-test
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/sip_cause/test-config.yaml
      - copied unchanged from r3219, asterisk/trunk/tests/channels/SIP/sip_cause/test-config.yaml
Modified:
    asterisk/team/mmichelson/phone-testsuite/   (props changed)
    asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/tests.yaml

Propchange: asterisk/team/mmichelson/phone-testsuite/
------------------------------------------------------------------------------
    automerge = *

Propchange: asterisk/team/mmichelson/phone-testsuite/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 14 17:01:10 2012
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-3215
+/asterisk/trunk:1-3220

Modified: asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/tests.yaml?view=diff&rev=3221&r1=3220&r2=3221
==============================================================================
--- asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/tests.yaml (original)
+++ asterisk/team/mmichelson/phone-testsuite/tests/channels/SIP/tests.yaml Mon May 14 17:01:10 2012
@@ -42,3 +42,5 @@
     - test: 'generic_ccss'
     - dir: 'sip_custom_presence'
     - test: 'custom_info'
+    - test: 'hangupcause'
+    - test: 'sip_cause'