[asterisk-commits] kmoore: branch 12 r429378 - in /branches/12: res/ tests/

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Dec 11 11:20:53 2014
New Revision: 429378

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429378
Log:
Fix incorrect patch applied in r429354

The patch that was applied was another pending patch. This swaps them out.

Modified:
    branches/12/res/res_sorcery_config.c
    branches/12/tests/test_stasis_channels.c

Modified: branches/12/res/res_sorcery_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_sorcery_config.c?view=diff&rev=429378&r1=429377&r2=429378
==============================================================================
--- branches/12/res/res_sorcery_config.c (original)
+++ branches/12/res/res_sorcery_config.c Thu Dec 11 11:20:53 2014
@@ -284,8 +284,6 @@
 			if (!(obj = sorcery_config_retrieve_id(sorcery, data, type, id))) {
 				continue;
 			}
-
-			ast_log(LOG_NOTICE, "Retaining existing configuration for object of type '%s' with id '%s'\n", type, id);
 		}
 
 		ao2_link_flags(objects, obj, OBJ_NOLOCK);

Modified: branches/12/tests/test_stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/tests/test_stasis_channels.c?view=diff&rev=429378&r1=429377&r2=429378
==============================================================================
--- branches/12/tests/test_stasis_channels.c (original)
+++ branches/12/tests/test_stasis_channels.c Thu Dec 11 11:20:53 2014
@@ -278,6 +278,7 @@
 				 "  s: { s: s, s: s, s: i },"
 				 "  s: { s: s, s: s },"
 				 "  s: { s: s, s: s },"
+				 "  s: s"
 				 "  s: o"
 				 "}",
 				 "name", "TEST/name",
@@ -294,6 +295,7 @@
 				 "connected",
 				 "name", "",
 				 "number", "",
+				 "language", "en",
 				 "creationtime",
 				 ast_json_timeval(
 					 ast_channel_creationtime(chan), NULL));