study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
fangjian0423
2018-11-20 12:00:36 +08:00
parent b2af35d84b b4b8fa0d19
commit d88e27e45c
24 changed files with 1047 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -55,6 +55,13 @@
<name>hengyunabc</name>
<email>hengyunabc@gmail.com</email>
</developer>
<developer>
<id>mercyblitz</id>
<name>Mercy Ma</name>
<email>mercyblitz@gmail.com</email>
<organization>Alibaba</organization>
<url>https://github.com/mercyblitz</url>
</developer>
</developers>
<properties>
@@ -82,13 +89,14 @@
<module>spring-cloud-alibaba-nacos-config</module>
<module>spring-cloud-alibaba-nacos-discovery</module>
<module>spring-cloud-stream-binder-rocketmq</module>
<module>spring-cloud-alibaba-nacos-config-server</module>
<module>spring-cloud-alicloud-context</module>
<module>spring-cloud-alibaba-examples</module>
<module>spring-cloud-alibaba-test</module>
<module>spring-cloud-alibaba-docs</module>
<module>spring-cloud-starter-alibaba</module>
<module>spring-cloud-starter-alicloud</module>
<module>spring-cloud-alicloud-oss</module>
<module>spring-cloud-alicloud-context</module>
<module>spring-cloud-alicloud-acm</module>
<module>spring-cloud-alicloud-ans</module>
</modules>