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

Conflicts:
	src/test/java/com/ctriposs/quickcache/QuickCacheStressTest.java