From 483c2be5d81f05e89386105fcf40b584a19a0f62 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 11 Dec 2014 17:20:53 +0000 Subject: [PATCH] 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 --- res/res_sorcery_config.c | 2 -- tests/test_stasis_channels.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/res_sorcery_config.c b/res/res_sorcery_config.c index 1e96bfae79..de369d353e 100644 --- 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 89240130ce..ed620e0bb6 100644 --- 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)); -- 2.47.2