chengjunxia bootcamp task modify & merge request
clean
rebuild test
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #431 from jialinsun/master

chengjunxia bootcamp task modify & merge request