Merge remote-tracking branch 'origin/master' into codereview

5058e7b1 · leon.li · e668733f · f147e8df · 5058e7b1
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

.gitignore .gitignore +4 -0

未找到文件。
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@
 .*
 /*.bat
 !.travis.yml
+
+cat-client/src/main/resources/com/dianping/cat/configuration/client/config.xsd
+
+cat-client/src/main/resources/com/dianping/cat/status/model/status.xsd