Fix incorrect patch applied in r429354

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

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

diff --git a/res/res_sorcery_config.c b/res/res_sorcery_config.c
index 1e96bfae7942313915dbaf9a81199441674fbdf0..de369d353e7ebcf7c2eccc6d08712979604ff6e5 100644 (file)
--- a/res/res_sorcery_config.c
+++ b/res/res_sorcery_config.c
@@ -284,8 +284,6 @@ static void sorcery_config_internal_load(void *data, const struct ast_sorcery *s
                        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);

diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c
index 89240130ce8a8bbc528467ad3ce67d20e0961a58..ed620e0bb6127dd27ce357f154f88ee581e1aa14 100644 (file)
--- a/tests/test_stasis_channels.c
+++ b/tests/test_stasis_channels.c
@@ -278,6 +278,7 @@ AST_TEST_DEFINE(channel_snapshot_json)
                                 "  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 @@ AST_TEST_DEFINE(channel_snapshot_json)
                                 "connected",
                                 "name", "",
                                 "number", "",
+                                "language", "en",
                                 "creationtime",
                                 ast_json_timeval(
                                         ast_channel_creationtime(chan), NULL));