reduce unnecessary method in DisplayPolicyManager
refactor heartbeat alert's query configs method
Merge branch 'master' of github.com:dianping/cat
stage some changes
Merge branch 'ace' of code.dianpingoa.com:arch/cat into ace
merger
Merge branch 'ace' of code.dianpingoa.com:arch/cat into ace
add the version 3
Merge pull request #693 from leonindy/master

make some changes
merge code
stage current work
modify the code
milestone
Merge branch 'ace' of code.dianpingoa.com:arch/cat into ace
merge newest code
resolve conflicts
local change
merge code
refactor tag