Merge fixes in config

This commit is contained in:
DanB
2020-04-08 20:31:04 +02:00
parent f76c0a8d12
commit 9f31c5515c
2 changed files with 4 additions and 10 deletions

View File

@@ -552,16 +552,10 @@ const CGRATES_CFG_JSON = `
//"string_indexed_fields": [], // query indexes based on these fields for faster processing
"prefix_indexed_fields": [], // query indexes based on these fields for faster processing
"nested_fields": false, // determines which field is checked when matching indexed filters(true: all; false: only the one on the first level)
<<<<<<< HEAD
"attributes_conns": [], // connections to AttributeS for altering events before supplier queries: <""|*internal|127.0.0.1:2013>
"resources_conns": [], // connections to ResourceS for *res sorting, empty to disable functionality: <""|*internal|x.y.z.y:1234>
"stats_conns": [], // connections to StatS for *stats sorting, empty to disable stats functionality: <""|*internal|x.y.z.y:1234>
=======
"attributes_conns": [], // connections to AttributeS for altering events before supplier queries: <""|*internal|$rpc_conns_id>
"resources_conns": [], // connections to ResourceS for *res sorting, empty to disable functionality: <""|*internal|$rpc_conns_id>
"stats_conns": [], // connections to StatS for *stats sorting, empty to disable stats functionality: <""|*internal|$rpc_conns_id>
"rals_conns": [], // connections to Rater for calculating cost, empty to disable stats functionality: <""|*internal|$rpc_conns_id>
>>>>>>> fc52ff5ad... [Docs] RALs documentation
"default_ratio":1 // default ratio used in case of *load strategy
},

View File

@@ -179,7 +179,7 @@ Time
.. Accounting:
.. _Accounting:
Accounting
----------
@@ -299,7 +299,7 @@ Blocker
.. ActionTrigger:
.. _ActionTrigger:
ActionTrigger
-------------
@@ -372,7 +372,7 @@ LastExecutionTime
Time when the *ActionTrigger* was executed last.
.. Action:
.. _Action:
Action
------
@@ -520,4 +520,4 @@ Use cases
* Classic rater calculating costs for events using :ref:`Rating`.
* Account bundles for fixed and mobile networks (xG) using :ref:`Accounting`.
* Volume discounts in real-time using :ref:`Accounting`.
* Fraud detection with automatic mitigation using :ref:`ActionTriggers <ActionTrigger`.
* Fraud detection with automatic mitigation using :ref:`ActionTriggers <ActionTrigger>`.