Author: dlee
Date: Mon Jul 29 14:53:31 2013
New Revision: 395705
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395705
Log:
Fix a few merge conflicts
Modified:
team/dlee/stasis-cache-split/res/ari/resource_bridges.c
team/dlee/stasis-cache-split/res/ari/resource_channels.c
team/dlee/stasis-cache-split/res/ari/resource_endpoints.c
Modified: team/dlee/stasis-cache-split/res/ari/resource_bridges.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/res/ari/resource_bridges.c?view=diff&rev=395705&r1=395704&r2=395705
==============================================================================
--- team/dlee/stasis-cache-split/res/ari/resource_bridges.c (original)
+++ team/dlee/stasis-cache-split/res/ari/resource_bridges.c Mon Jul 29 14:53:31
2013
@@ -454,15 +454,9 @@
struct ao2_iterator i;
void *obj;
-<<<<<<< HEAD:res/stasis_http/resource_bridges.c
cache = ast_bridge_cache();
if (!cache) {
- stasis_http_response_error(
-=======
- caching_topic = ast_bridge_topic_all_cached();
- if (!caching_topic) {
- ast_ari_response_error(
->>>>>>> stasis-rename:res/ari/resource_bridges.c
+ ast_ari_response_error(
response, 500, "Internal Server Error",
"Message bus not initialized");
return;
Modified: team/dlee/stasis-cache-split/res/ari/resource_channels.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/res/ari/resource_channels.c?view=diff&rev=395705&r1=395704&r2=395705
==============================================================================
--- team/dlee/stasis-cache-split/res/ari/resource_channels.c (original)
+++ team/dlee/stasis-cache-split/res/ari/resource_channels.c Mon Jul 29
14:53:31 2013
@@ -469,15 +469,9 @@
struct stasis_cache *cache;
struct ast_channel_snapshot *snapshot;
-<<<<<<< HEAD:res/stasis_http/resource_channels.c
cache = ast_channel_cache();
if (!cache) {
- stasis_http_response_error(
-=======
- caching_topic = ast_channel_topic_all_cached();
- if (!caching_topic) {
- ast_ari_response_error(
->>>>>>> stasis-rename:res/ari/resource_channels.c
+ ast_ari_response_error(
response, 500, "Internal Server Error",
"Message bus not initialized");
return;
@@ -528,15 +522,9 @@
struct ao2_iterator i;
void *obj;
-<<<<<<< HEAD:res/stasis_http/resource_channels.c
cache = ast_channel_cache();
if (!cache) {
- stasis_http_response_error(
-=======
- caching_topic = ast_channel_topic_all_cached();
- if (!caching_topic) {
- ast_ari_response_error(
->>>>>>> stasis-rename:res/ari/resource_channels.c
+ ast_ari_response_error(
response, 500, "Internal Server Error",
"Message bus not initialized");
return;
Modified: team/dlee/stasis-cache-split/res/ari/resource_endpoints.c
URL:
http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/res/ari/resource_endpoints.c?view=diff&rev=395705&r1=395704&r2=395705
==============================================================================
--- team/dlee/stasis-cache-split/res/ari/resource_endpoints.c (original)
+++ team/dlee/stasis-cache-split/res/ari/resource_endpoints.c Mon Jul 29
14:53:31 2013
@@ -43,15 +43,9 @@
struct ao2_iterator i;
void *obj;
-<<<<<<< HEAD:res/stasis_http/resource_endpoints.c
cache = ast_endpoint_cache();
if (!cache) {
- stasis_http_response_error(
-=======
- caching_topic = ast_endpoint_topic_all_cached();
- if (!caching_topic) {
ast_ari_response_error(
->>>>>>> stasis-rename:res/ari/resource_endpoints.c
response, 500, "Internal Server Error",
"Message bus not initialized");
return;
@@ -97,15 +91,9 @@
/* TODO - if tech isn't a recognized type of endpoint, it should 404 */
-<<<<<<< HEAD:res/stasis_http/resource_endpoints.c
cache = ast_endpoint_cache();
if (!cache) {
- stasis_http_response_error(
-=======
- caching_topic = ast_endpoint_topic_all_cached();
- if (!caching_topic) {
ast_ari_response_error(
->>>>>>> stasis-rename:res/ari/resource_endpoints.c
response, 500, "Internal Server Error",
"Message bus not initialized");
return;
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
