You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@rocketmq.apache.org by di...@apache.org on 2019/01/17 13:20:24 UTC

[rocketmq-spring] 18/37: Merge pull request #2 from walking98/master

This is an automated email from the ASF dual-hosted git repository.

dinglei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-spring.git

commit 3ba290d479ae4bc2c0cb41d2b0629caab4c90ad0
Merge: e895eec 06dfd51
Author: von gosling <vo...@apache.org>
AuthorDate: Fri Dec 14 16:24:04 2018 +0800

    Merge pull request #2 from walking98/master
    
    Support configuration property with relaxed names

 README.md                                              | 18 +++++++++---------
 README_zh_CN.md                                        | 18 +++++++++---------
 pom.xml                                                |  2 +-
 rocketmq-spring-boot-parent/pom.xml                    |  4 ++--
 rocketmq-spring-boot-samples/pom.xml                   |  2 +-
 .../src/main/resources/application.properties          |  2 +-
 rocketmq-spring-boot-starter/pom.xml                   |  2 +-
 rocketmq-spring-boot/pom.xml                           |  2 +-
 .../spring/config/RocketMQAutoConfiguration.java       |  5 +++--
 .../rocketmq/spring/config/RocketMQProperties.java     | 10 +++++-----
 .../spring/config/RocketMQAutoConfigurationTest.java   | 14 ++++++++++++--
 11 files changed, 45 insertions(+), 34 deletions(-)