Merge branch 'master' of github.com:dianping/cat
cat agent代码重构
update codegen version
Merge branch 'master' of code.dianpingoa.com:arch/cat
Merge pull request #357 from leonindy/master

add 2 new RuleType for fluctuate case
milestone for Agent
cdn recall page
Merge pull request #358 from zengwei0771/master

cdn recall page
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
添加sigar库，修改pom.xml，添加sigarutil
support dal heartbeat report
Merge branch 'master' of code.dianpingoa.com:arch/cat
resolve conflicts
delete log fiel
代码完善，调优
Merge pull request #355 from jialinsun/master

cat agent代码重构