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

..

dbsmerge_mongo.py

Fixed the script

2017-09-12 15:24:27 +00:00

dbsmerge_redis.py

Fixed the script

2017-09-12 15:24:27 +00:00

mysql_cdr_migration.sql

Small fix

2017-09-17 23:53:15 +00:00

mysql_tables_update.sql

Added migration from action triggers to thresholds and cdrstats to stats

2017-11-07 14:10:32 +01:00

pg_cdr_migration.sql

Fixed broken postgres script

2017-09-15 15:29:53 +00:00

pg_tables_update.sql

small fix

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

rc7_to_rc8.sh

Added dryRun , stats and multiple variable migration

2017-09-17 23:44:12 +00:00

set_version.sql

Fixed the automatic migration script

2017-09-17 02:13:58 +00:00

usage_float_to_int.sql

Fixed merge fail

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