This is an automated email from the ASF dual-hosted git repository. huxing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit b48e8bac049e41e43e982b115e91c4f0c5a6775c Merge: a45206c 48f34fe Author: Huxing Zhang <huxing.zh...@gmail.com> AuthorDate: Thu May 17 16:19:17 2018 +0800 Merge branch 'ralf0131-graceful-shutdown-in-tomcat' all/pom.xml | 8 ++ dubbo-bootstrap/pom.xml | 47 ++++++++ .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 133 +++++++++++++++++++++ .../alibaba/dubbo/common/utils/ExecutorUtil.java | 10 +- .../com/alibaba/dubbo/config/AbstractConfig.java | 12 -- .../com/alibaba/dubbo/config/ProtocolConfig.java | 25 ---- .../com/alibaba/dubbo/config/RegistryConfig.java | 11 +- .../alibaba/dubbo/config/ProtocolConfigTest.java | 10 -- ...onfigTest.java => ProtocolConfigTest.java.orig} | 12 +- dubbo-config/dubbo-config-spring/pom.xml | 14 +++ .../initializer/DubboApplicationListener.java | 45 +++++++ .../DubboWebApplicationInitializer.java | 40 +++++++ .../dubbo/registry/support/FailbackRegistry.java | 9 +- .../dubbo/registry/dubbo/DubboRegistry.java | 13 +- .../registry/multicast/MulticastRegistry.java | 2 + .../dubbo/registry/redis/RedisRegistry.java | 2 + pom.xml | 1 + 17 files changed, 325 insertions(+), 69 deletions(-) -- To stop receiving notification emails like this one, please contact hux...@apache.org.