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

..

v1

Fixed merge fail

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

v2

Add HasData in DataManager

2017-10-30 18:26:23 +01:00