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

..

apitpdata_test.go

ApierV1.GetCacheKeys implementation, precaching on start fixes #614

2016-12-28 13:06:00 +01:00

apitpdata.go

Add FilterIDs in Resource

2017-10-27 14:33:56 +02:00

basic_auth_test.go

Add basic authentication without dependencies

2016-11-10 16:35:08 -07:00

basic_auth.go

Removed copyright from go doc

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

birpcint_client.go

Removed copyright from go doc

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

cache_file_info.go

Removed copyright from go doc

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

cgrrecordwriter.go

Removed copyright from go doc

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

consts.go

Fixed merge fail

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

coreutils_test.go

Support for timestamp with timezone containing offset as ID

2017-11-14 12:10:13 +01:00

coreutils.go

Support for timestamp with timezone containing offset as ID

2017-11-14 12:10:13 +01:00

dateseries_test.go

added tests for Contains

2017-07-04 23:22:15 +03:00

dateseries.go

Removed copyright from go doc

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

derivedchargers_test.go

Updated project README, COPYRIGHT information

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

derivedchargers.go

Removed copyright from go doc

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

errors_test.go

APIErrorHandler

2016-11-18 14:14:22 +01:00

errors.go

ApierV1 and StatSV1 APIs for StatS

2017-09-20 17:53:20 +02:00

logger.go

updated the interaction between kamevapi and cgrates

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

map_test.go

Versioning fix

2017-09-07 15:00:18 +00:00

map.go

Removed copyright from go doc

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

poster_it_test.go

Small poster modifications

2017-01-31 19:07:05 +01:00

poster_test.go

Small poster modifications

2017-01-31 19:07:05 +01:00

poster.go

Removed copyright from go doc

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

reflect_test.go

CastFieldIfToString with time.Duration support for acd/tcd

2017-10-22 17:21:50 +02:00

reflect.go

ThresholdS running with common filters, Thresholds.MinHits implementation, integration tests

2017-10-26 17:51:22 +02:00

researchreplace_test.go

Updated project README, COPYRIGHT information

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

researchreplace.go

Removed copyright from go doc

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

rpc_params_test.go

fix tests

2016-05-26 16:15:50 +03:00

rpc_params.go

Removed copyright from go doc

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

rsrfield_test.go

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

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

rsrfield.go

Using MetaPipe (*|) as in-filter separator

2017-11-14 08:43:11 +01:00

server.go

Removed copyright from go doc

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

slice_test.go

Tests from utils sorted

2016-10-29 17:46:26 +02:00

slice.go

Removed copyright from go doc

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

struct_test.go

Added more tests and sorted others

2016-10-29 17:45:11 +02:00

struct.go

Removed copyright from go doc

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

value_formula_test.go

Updated project README, COPYRIGHT information

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

value_formula.go

Removed copyright from go doc

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