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

Conflicts:
	engine/onstor_it_test.go
	engine/storage_map.go
	engine/storage_mongo_datadb.go
	engine/storage_redis.go
	engine/version.go

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

..

cgr-engine.go

Refactored some tests and made some changes

2017-09-06 14:56:05 +00:00

engine_test.go

Remove Balancer

2017-04-09 07:40:59 +03:00

rater.go

Rename ResourceConfig -> ResourceProfile

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

registration.go

Remove Balancer

2017-04-09 07:40:59 +03:00