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:36 UTC

[rocketmq-spring] 30/37: Merge pull request #14 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 85b9e2a697a2490eb866cd13b3a424bded8f5579
Merge: 07598bf d0f973f
Author: von gosling <vo...@apache.org>
AuthorDate: Wed Dec 19 15:38:10 2018 +0800

    Merge pull request #14 from walking98/master
    
    Fixed for [ISSUE-9] & [ISSUE-7]

 README.md                                            | 20 ++++++++++----------
 README_zh_CN.md                                      | 20 ++++++++++----------
 .../springboot/consumer/OrderPaidEventConsumer.java  |  2 +-
 .../samples/springboot/consumer/StringConsumer.java  |  2 +-
 .../consumer/StringTransactionalConsumer.java        |  2 +-
 .../src/main/resources/application.properties        | 12 +++++++-----
 .../samples/springboot/ProducerApplication.java      |  8 ++++----
 .../src/main/resources/application.properties        | 14 ++++++++------
 .../config/ListenerContainerConfiguration.java       |  6 ++++--
 .../spring/config/RocketMQAutoConfiguration.java     |  8 ++++----
 .../rocketmq/spring/config/RocketMQProperties.java   |  2 +-
 .../spring/config/TransactionHandlerRegistry.java    |  8 +++++---
 .../rocketmq/spring/core/RocketMQTemplate.java       |  2 ++
 .../support/DefaultRocketMQListenerContainer.java    |  7 ++++++-
 .../spring/config/RocketMQAutoConfigurationTest.java | 10 +++++-----
 15 files changed, 69 insertions(+), 54 deletions(-)