move AlertSummaryStringDecorator to test
Merge branch 'master' of https://github.com/dianping/cat
modify the sql
Merge branch 'master' of github.com:dianping/cat
add the handler
add new model: AlertType
Merge branch 'master' of https://github.com/dianping/cat into develop
add alert type page and manager
ignore xdd files
fix metric analyzer bug
fix bugs for heartbeat
Merge branch 'master' of code.dianpingoa.com:arch/cat
modify the alteration
Merge branch 'master' of code.dianpingoa.com:arch/cat
modify the payload query
add the dal version
before pull
Merge branch 'master' of https://github.com/dianping/cat
modify the bug
change apis