no message
Merge branch 'master' of https://github.com/jinfei21/timesquencedb

Conflicts:
	src/main/java/com/ctriposs/tsdb/manage/FileManager.java