before pull
Merge branch 'master' of https://github.com/dianping/cat
commit before pull
delete comment
resolve conflicts
Merge branch 'master' of https://github.com/dianping/cat
rebuild
Merge pull request #410 from jialinsun/master

第三方监控