TeoV 6325e26c4b Merge branch 'master' of https://github.com/cgrates/cgrates ...

Conflicts:
	engine/loader_csv_test.go
	engine/loader_it_test.go
	engine/tp_reader.go

2017-09-06 10:56:40 -04:00

..

account_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

account.go

Clear balance subject in rates before further monetary debits

2017-08-30 21:06:33 +02:00

action_plan_test.go

Cache GetCloned method

2016-11-22 17:39:53 +01:00

action_plan.go

utils.MINUTE -> utils.MetaEveryMinute, utils.HOUR -> utils.MetaHourly

2017-06-03 11:17:39 +02:00

action_trigger.go

Renaming StatsQueue into CDRStatsQueue

2017-07-05 17:05:18 +02:00

action.go

Renaming StatsQueue into CDRStatsQueue

2017-07-05 17:05:18 +02:00

actions_it_test.go

Merge branch 'master' of https://github.com/Edwardro22/cgrates

2016-11-28 02:04:22 +01:00

actions_test.go

Renaming StatsQueue into CDRStatsQueue

2017-07-05 17:05:18 +02:00

aliases_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

aliases.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

balance_filter.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

balances_test.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

balances.go

Clear balance subject in rates before further monetary debits

2017-08-30 21:06:33 +02:00

callcost_test.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

callcost.go

CallCost rounding fix to avoid panic

2017-06-02 17:25:21 +02:00

calldesc_test.go

Clear balance subject in rates before further monetary debits

2017-08-30 21:06:33 +02:00

calldesc.go

Clear balance subject in rates before further monetary debits

2017-08-30 21:06:33 +02:00

cdr_it_test.go

Small fix

2016-11-28 12:42:11 +01:00

cdr_test.go

Small fix v3

2017-08-10 07:46:19 -04:00

cdr.go

RequestFilter - test for stats into stats package, stats.Stats matching rpcclient.RpcClient interface

2017-08-09 00:06:13 +02:00

cdre.go

RADIUS Auth with integration tests

2017-06-13 17:10:37 +02:00

cdrecsv_test.go

ApierV1.ExportCDRs API

2017-02-17 15:28:39 +01:00

cdrefwv_test.go

ApierV1.ExportCDRs API

2017-02-17 15:28:39 +01:00

cdrs.go

Stats configured within CDRS

2017-08-09 00:58:46 +02:00

cdrstats_queue.go

StatsService basic functions

2017-07-09 15:27:29 +02:00

cdrstats.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

cdrstatsiface.go

Renaming StatsQueue into CDRStatsQueue

2017-07-05 17:05:18 +02:00

cgrcdr_test.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

cgrcdr.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

datacost.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

datamanagers.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

destinations_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

destinations.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

event.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

eventcost_test.go

EventCost fixes

2017-08-22 16:33:38 +02:00

eventcost.go

EventCost fixes

2017-08-22 16:33:38 +02:00

fscdr_test.go

RSRField - add Rule string so we can retrieve the rule after creation

2017-02-21 15:58:14 +01:00

fscdr.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

groups.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

handler_derivedcharging_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

handler_derivedcharging.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

history_test.go

Cache with -1 for unlimited, ResourceS with short and long caching

2017-09-03 20:12:59 +02:00

lcr_test.go

Cache with -1 for unlimited, ResourceS with short and long caching

2017-09-03 20:12:59 +02:00

lcr.go

Cache with -1 for unlimited, ResourceS with short and long caching

2017-09-03 20:12:59 +02:00

libengine.go

RPCClient with lazyConnect

2016-11-08 16:03:30 +01:00

libeventcost.go

Radius radReqAsSMGEvent, handler for *usage_difference, tests

2017-06-11 10:48:42 +02:00

libstats.go

Fix for rename ResourceLimit -> Resource and fix from storage_mongo_datadb.go GetKeysForPrefix

2017-09-01 07:39:29 -04:00

libtest.go

config resource_limits -> resources; ResourceLimits.csv -> Resources.csv

2017-08-15 17:53:11 +02:00

loader_csv_test.go

Merge branch 'master' of https://github.com/cgrates/cgrates

2017-09-06 10:56:40 -04:00

loader_it_test.go

Merge branch 'master' of https://github.com/cgrates/cgrates

2017-09-06 10:56:40 -04:00

model_helpers_test.go

Rename ResourceConfig -> ResourceProfile

2017-09-06 10:44:33 -04:00

model_helpers.go

Rename ResourceConfig -> ResourceProfile

2017-09-06 10:44:33 -04:00

models.go

StorDB tp_resource_limits -> tp_resources

2017-08-15 18:48:38 +02:00

onstor_it_test.go

Rename ResourceConfig -> ResourceProfile

2017-09-06 10:44:33 -04:00

pubsub_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

pubsub.go

StartEngine changes in libtest

2017-05-12 19:20:41 +02:00

rateinterval_test.go

utils.MINUTE -> utils.MetaEveryMinute, utils.HOUR -> utils.MetaHourly

2017-06-03 11:17:39 +02:00

rateinterval.go

utils.MINUTE -> utils.MetaEveryMinute, utils.HOUR -> utils.MetaHourly

2017-06-03 11:17:39 +02:00

ratingplan_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

ratingplan.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

ratingprofile_test.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

ratingprofile.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

rawcdr.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

reqfilter_test.go

RequestFilter - test for stats into stats package, stats.Stats matching rpcclient.RpcClient interface

2017-08-09 00:06:13 +02:00

reqfilter.go

RequestFilter - test for stats into stats package, stats.Stats matching rpcclient.RpcClient interface

2017-08-09 00:06:13 +02:00

reqfilterhelpers.go

TpReader - create Resources when not in dataDB together with ResourceConfigs

2017-09-05 18:34:26 +02:00

reqfilterindexer.go

Adding resource limit indexing to tp_reader, automatic start or RPC service for RLs

2017-05-07 16:12:33 +02:00

resources_test.go

Rename ResourceConfig -> ResourceProfile

2017-09-06 10:44:33 -04:00

resources.go

Merge branch 'master' of https://github.com/cgrates/cgrates

2017-09-06 10:56:40 -04:00

responder_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

responder.go

EventCost replacing CallCost in SMGSession

2017-06-01 12:00:37 +02:00

sharedgroup_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

sharedgroup.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

stats_metrics.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

statscdrs_test.go

Adding keeping cdrstats_test.go -> statscdrs_test.go to keep the order of test execution

2017-07-09 16:15:34 +02:00

storage_cdrs_it_test.go

StorDB config conn_max_lifetime, fixes #684

2017-07-02 15:25:30 +02:00

storage_csv.go

Rename ResourceConfig -> ResourceProfile

2017-09-06 10:44:33 -04:00

storage_interface.go

Rename ResourceConfig -> ResourceProfile

2017-09-06 10:44:33 -04:00

storage_map.go

Merge branch 'master' of https://github.com/cgrates/cgrates

2017-09-06 10:56:40 -04:00

storage_mongo_datadb.go

Merge branch 'master' of https://github.com/cgrates/cgrates

2017-09-06 10:56:40 -04:00

storage_mongo_stordb.go

Fix for rename from ResourceLimit -> Resource

2017-08-30 05:33:34 -04:00

storage_mysql.go

StorDB config conn_max_lifetime, fixes #684

2017-07-02 15:25:30 +02:00

storage_postgres.go

StorDB config conn_max_lifetime, fixes #684

2017-07-02 15:25:30 +02:00

storage_redis.go

Merge branch 'master' of https://github.com/cgrates/cgrates

2017-09-06 10:56:40 -04:00

storage_sql.go

Fix for rename from ResourceLimit -> Resource

2017-08-30 05:33:34 -04:00

storage_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

storage_utils.go

added tests

2017-07-29 11:19:29 +03:00

stordb_it_test.go

Add tpresources_it_test.go and refactoring tpstats_it_test.go with subtests

2017-09-04 06:31:20 -04:00

suretax_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

suretax.go

SMGeneric fix compute mechanism in getSessionIDsForPrefix

2016-11-25 14:23:32 +01:00

thresholds.go

Adding missing imports for thresholds

2017-08-01 14:49:40 +02:00

timespans_test.go

TSMerge without compress/decompress

2016-09-16 10:29:37 +02:00

timespans.go

connect fee in first increment

2016-11-29 17:46:17 +01:00

tp_reader.go

Merge branch 'master' of https://github.com/cgrates/cgrates

2017-09-06 10:56:40 -04:00

tpexporter.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

tpimporter_csv.go

Fix for rename from ResourceLimit -> Resource

2017-08-30 05:33:34 -04:00

units_counter_test.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

units_counter.go

Updated project README, COPYRIGHT information

2016-09-02 13:04:34 +02:00

users_test.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

users.go

Accounting, Rating DBs merge, TPModels in StorDB

2017-04-03 21:17:12 +03:00

version.go

Rename ResourceConfig -> ResourceProfile

2017-09-06 10:44:33 -04:00