chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/mcy

Browse Source 
# Conflicts:
#	client-adapter/launcher/src/main/resources/application.yml
This commit is contained in:
mcy
2018-11-01 16:39:56 +08:00
parent 96b9484f70 865ba94605
commit f42f7cfe72
3 changed files with 50 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client-adapter/launcher/pom.xml
View File

@@ -188,14 +188,6 @@
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>application.yml</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>