Radu Ioan Fericean ede467c899 Merge branch 'lcr' ...

Conflicts:
	engine/calldesc.go
	engine/handler_derivedcharging.go
	mediator/mediator.go
	utils/apitpdata.go

2014-04-29 14:20:15 +03:00

..

fsfilecsvcdr.go

FsCgrId -> Sha1, making the CgrId even more uniquely by hashing it with setup time

2014-04-08 17:51:18 +02:00

mediator_local_test.go

Fix MediatorLocal test considering derived charging

2014-04-27 14:51:05 +02:00

mediator_rpc.go

FsCgrId -> Sha1, making the CgrId even more uniquely by hashing it with setup time

2014-04-08 17:51:18 +02:00

mediator_test.go

Integration of DerivedCharging within mediation

2014-04-24 18:33:18 +02:00

mediator.go

Merge branch 'lcr'

2014-04-29 14:20:15 +03:00