hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rebase problems

Browse Source
This commit is contained in:
Johan Wikman
2018-08-08 09:21:59 +03:00
parent c06b36a6ee
commit 0b3e9cce75
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/config_runtime.cc
View File

@ -1014,7 +1014,7 @@ bool runtime_destroy_filter(const SFilterDef& filter)
else else
{ {
config_runtime_error("Filter '%s' cannot be destroyed: Remove it from all services " config_runtime_error("Filter '%s' cannot be destroyed: Remove it from all services "
"first", filter->name); "first", filter->name.c_str());
} }
return rval; return rval;
@ -1333,7 +1333,7 @@ static bool is_valid_resource_body(json_t* json)
if (j && !json_is_object(j)) if (j && !json_is_object(j))
{ {
runtime_error("Relationship '%s' is not an object",*it); config_runtime_error("Relationship '%s' is not an object", *it);
rval = false; rval = false;
} }
} }
@ -1973,7 +1973,7 @@ bool service_to_filter_relations(Service* service, json_t* old_json, json_t* new
} }
else else
{ {
runtime_error("Invalid object relations for '%s'", service->name); config_runtime_error("Invalid object relations for '%s'", service->name);
} }
return rval; return rval;