Merge branch 'master' into fixed/855

This commit is contained in:
吴晟 Wu Sheng 2018-03-03 20:59:18 +08:00 committed by GitHub
commit 5d0ea12683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ target/
packages/
**/dependency-reduced-pom.xml
/skywalking-agent/
/dist/

View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-backend-dist</artifactId>
<artifactId>apm-dist</artifactId>
<packaging>pom</packaging>