u
Merge branch 'master' of https://github.com/dianping/cat
Merge pull request #303 from zengwei0771/master

delete ads-1600