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

..

conf

Add Filter in Cache

2017-10-25 19:38:22 +02:00

daemontools

Debian packaging refactored, ready for nightly packages

2014-01-05 15:42:55 +01:00

diameter/dict/huawei

Diameter fixes to cope with application type=auth, diameter tests back on track

2017-04-03 16:57:06 +02:00

docker

docker 1.7

2016-08-16 15:31:10 +03:00

freeswitch/conf

return -UNAUTHORIZED_DESTINATION when rp not found

2015-11-12 13:06:30 +02:00

kamailio/etc/kamailio

Update Kamailio config files to use evapi_relay instead of evapi_async_relay for CALL_START and CALL_END events, fixes #307

2016-01-03 17:22:35 +01:00

monit

Fix in documentation changed default CDRs port which is now 2080

2014-03-05 12:06:09 +01:00

radius/dict

RADIUS integration tests for accounting start and stop with CDR generation

2017-06-14 19:28:03 +02:00

scripts

small fix

2017-09-15 15:36:30 +00:00

storage

Fixed merge fail

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

tariffplans

Merge branch 'master' into master

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

tester

Fix cgr-tester.py script

2014-08-04 14:57:42 +02:00

tutorials

Default port towards 2014 in OpenSIPS native tutorial

2017-07-28 20:58:27 +02:00

vagrant

local test on docker working

2016-03-28 15:59:59 +03:00