edwardro22 9b1846d765 Fixed merge fail ...

Conflicts:
	data/storage/migrator/usage_float_to_int.sql
	engine/version.go
	migrator/migrator.go
	migrator/migrator_it_test.go
	migrator/stats.go
	migrator/thresholds.go
	utils/consts.go

2017-11-14 13:47:43 +00:00

..

accounts_test.go

Updated tests in apier/v1

2017-10-09 15:28:58 +03:00

accounts.go

Add test for ApierV1.RemoveAccount in general_tests and update method

2017-11-08 13:56:14 +01:00

aliases.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

apier_it_test.go

TPReader creating StatQueue based on StatQueueProfile, adding necessary methods in dataDB, tests

2017-09-13 18:54:05 +02:00

apier.go

Add HasData in DataManager

2017-10-30 18:26:23 +01:00

auth.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

cdrc.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

cdre.go

Update internal/external adress

2017-11-07 12:39:37 +01:00

cdrs.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

cdrstatsv1_it_test.go

Refactoring of IT Tests

2016-11-28 14:17:56 +01:00

cdrstatsv1.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

cdrsv1.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

costs.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

debit_test.go

Add SetRatingProfile in DataManager

2017-10-21 11:48:28 +02:00

debit.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

derivedcharging_test.go

Updated tests in apier/v1

2017-10-09 15:28:58 +03:00

derivedcharging.go

Add HasData in DataManager

2017-10-30 18:26:23 +01:00

filters_it_test.go

Add ActivationInterval to filter and updated test

2017-10-13 14:19:01 +02:00

filters.go

Add RemoveFilter in DataManager

2017-10-13 14:19:01 +02:00

lcr.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

resourcesv1_it_test.go

Update Filters.csv for Resource

2017-10-27 20:38:49 +03:00

resourcesv1.go

Add Get/Set/Remove ResourceProfile in Datamanager

2017-10-20 21:06:38 +02:00

scheduler.go

DataDB -> DataManager

2017-10-09 14:59:27 +03:00

smgenericbirpcv1.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

smgenericv1_it_test.go

Caching StatQueueProfile and StatQueue and upadte tests

2017-11-08 15:22:11 +01:00

smgenericv1.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

smv1.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

stats_it_test.go

Add FilterIDs in StatQueue and FilterS in StatS

2017-10-27 12:52:55 +02:00

stats.go

Add RemoveStatQueueProfile in Datamanger

2017-10-20 21:06:38 +02:00

thresholds_it_test.go

CDRS with thresholds for *raw CDRs

2017-10-27 19:44:44 +02:00

thresholds.go

Add RemoveThresholdProfile in DataManager

2017-10-20 21:06:38 +02:00

tp_it_test.go

Add FilterProfile + test for it

2017-10-02 16:12:12 +03:00

tp.go

Added move feature(to migrate data from one db to another) and updated GetTPIds , IsDBempty and the versioning accordingly

2017-11-14 13:16:02 +00:00

tpaccountactions_it_test.go

Add test for TPCdrStats and update test on TPAccountActions

2017-09-20 16:15:14 +03:00

tpaccountactions.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpactionplans_it_test.go

Add tests for TPAccountActions and TPAccountPlans

2017-09-14 15:23:42 +03:00

tpactionplans.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpactions_it_test.go

Add test fot TPActions

2017-09-14 16:56:13 +03:00

tpactions.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpactiontriggers_it_test.go

Small Fix

2017-09-20 17:51:28 +03:00

tpactiontriggers.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpaliases.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

tpcdrstats_it_test.go

Add test for TPCdrStats and update test on TPAccountActions

2017-09-20 16:15:14 +03:00

tpcdrstats.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpderivedcharges_it_test.go

Add test for TPDerivedCahrges

2017-09-15 12:49:06 +03:00

tpderivedcharges.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpdestinationrates.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpdestinations_it_test.go

Add tests for TPRatingPlans and TPDestinations

2017-09-13 14:08:01 +03:00

tpdestinations.go

Removed copyright from go doc

2017-09-10 15:02:46 +00:00

tpfilters_it_test.go

Add ActivationInterval to filter and updated test

2017-10-13 14:19:01 +02:00

tpfilters.go

Rename method and updated tpexporter

2017-10-24 16:49:17 +03:00

tplcrrules_it_test.go

Add TPFilter in apier/v1 and test for it

2017-10-03 18:13:21 +03:00

tplcrrules.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tprates_it_test.go

Add tests for TPRatingPlans and TPDestinations

2017-09-13 14:08:01 +03:00

tprates.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpratingplans_it_test.go

Add tests for TPRatingPlans and TPDestinations

2017-09-13 14:08:01 +03:00

tpratingplans.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpratingprofiles_it_test.go

Add tests for TPRatingPlans and TPDestinations

2017-09-13 14:08:01 +03:00

tpratingprofiles.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpresources_it_test.go

Update test for TP

2017-10-30 10:11:51 +01:00

tpresources.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpsharedgroups_it_test.go

Add tests for TPRatingPlans and TPDestinations

2017-09-13 14:08:01 +03:00

tpsharedgroups.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpstats_it_test.go

Update test for TP

2017-10-30 10:11:51 +01:00

tpstats.go

Rename Tag with ID for TPStats and TPThresholds and set pk new primary key

2017-09-29 17:38:04 +03:00

tpthresholds_it_test.go

Update test for TP

2017-10-30 10:11:51 +01:00

tpthresholds.go

Rename method and updated tpexporter

2017-10-24 16:49:17 +03:00

tptimings_it_test.go

Add tests for TPRatingPlans and TPDestinations

2017-09-13 14:08:01 +03:00

tptimings.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

tpusers_it_test.go

Add tests for TPRatingPlans and TPDestinations

2017-09-13 14:08:01 +03:00

tpusers.go

Add test for tpactiontriggers and fix Server Error : Not found for all TPs

2017-09-20 17:50:30 +03:00

triggers.go

Add SetActionTriggers in DataManager

2017-10-20 21:06:38 +02:00