Merge branch 'master' of github.com:dianping/cat
update codegen version
Merge branch 'master' of code.dianpingoa.com:arch/cat
fix the xml
Merge branch 'master' of github.com:dianping/cat
fix the code
Merge branch 'master' of code.dianpingoa.com:arch/cat
fix the ip
support dal heartbeat report
Merge branch 'master' of code.dianpingoa.com:arch/cat
modify the agent
merge the cnd
modify the task
Merge pull request #360 from youyong205/master

merge