review recovery strategy, ready for demo
Merge pull request #32 from ErikFang/master

review recovery strategy, ready for demo
Merge pull request #15 from dianping/master

from dianping to jin