Merge branch 'master' into v1.3.2-lettucepatch
# Conflicts: # common-core/pom.xml # common-util/pom.xml # config-starter/pom.xml # elasticsearch-starter/pom.xml # logger-starter/pom.xml # matrix-bigdata/matrix-bigdata-hbase-starter/pom.xml # matrix-bigdata/matrix-bigdata-spark-starter/pom.xml # matrix-bigdata/pom.xml # matrix-bus/matrix-bus-canal-starter/pom.xml # matrix-bus/pom.xml # matrix-client/matrix-client-openfeign-starter/pom.xml # matrix-datahelper/matrix-datahelper-redis-core/pom.xml # matrix-datahelper/matrix-datahelper-redis-starter/pom.xml # matrix-datahelper/pom.xml # matrix-datasource/matrix-datasource-core/pom.xml # matrix-datasource/matrix-datasource-druid/pom.xml # matrix-datasource/pom.xml # matrix-job/matrix-job-core/pom.xml # matrix-job/matrix-job-xxl-core/pom.xml # matrix-job/matrix-job-xxl-starter/pom.xml # matrix-job/pom.xml # matrix-mq/matrix-mq-rocketmq-client/pom.xml # matrix-mq/matrix-mq-rocketmq-core/pom.xml # matrix-mq/matrix-mq-rocketmq-starter/pom.xml # matrix-mq/pom.xml # matrix-mybatis/matrix-mybatis-core/pom.xml # matrix-mybatis/matrix-mybatis-starter/pom.xml # matrix-mybatis/pom.xml # matrix-protocol/matrix-protocol-core/pom.xml # matrix-protocol/matrix-protocol-dubbo-core/pom.xml # matrix-protocol/matrix-protocol-dubbo-starter/pom.xml # matrix-protocol/matrix-protocol-web-core/pom.xml # matrix-protocol/matrix-protocol-web-starter/pom.xml # matrix-protocol/pom.xml # mongodb-starter/pom.xml # monitor-starter/pom.xml # pom.xml # redis-starter/pom.xml # redis-starter/src/main/java/com/secoo/mall/redis/config/MatrixeRedisAutoConfiguration.java # rocketmq-starter/pom.xml
Showing
This diff is collapsed.
Click to expand it.
elasticsearch-starter/README.md
deleted
100644 → 0
matrix-client/pom.xml
0 → 100644
matrix-gracefulshutdown/pom.xml
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
matrix-mq/README.md
0 → 100644
mongodb-starter/README.md
deleted
100644 → 0
monitor-starter/README.md
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
openfeign-starter/README.md
deleted
100644 → 0
redis-starter/README.md
deleted
100644 → 0
Please
register
or
sign in
to comment