Merge branch '2.6.2-release'
authorken.lj <ken.lj.hz@gmail.com>
Wed, 6 Jun 2018 01:29:31 +0000 (09:29 +0800)
committerken.lj <ken.lj.hz@gmail.com>
Wed, 6 Jun 2018 01:29:31 +0000 (09:29 +0800)
commitd6faa92be1ccffe5bd1dbecb8cfb394c44895729
tree39ff430a8ce11f2565d03cdde0c97df4075ebdc4
parent5856d4f0631b65aa9adcd2e88c065bbc7a3a8ee2
parent1e729afa0a6fd3bbf39a5713434d29ba7712b1cf
Merge branch '2.6.2-release'

# Conflicts:
# all/pom.xml
# bom/pom.xml
# dependencies-bom/pom.xml
# dubbo-cluster/pom.xml
# dubbo-common/pom.xml
# dubbo-config/dubbo-config-api/pom.xml
# dubbo-config/dubbo-config-spring/pom.xml
# dubbo-config/pom.xml
# dubbo-container/dubbo-container-api/pom.xml
# dubbo-container/dubbo-container-log4j/pom.xml
# dubbo-container/dubbo-container-logback/pom.xml
# dubbo-container/dubbo-container-spring/pom.xml
# dubbo-container/pom.xml
# dubbo-demo/dubbo-demo-api/pom.xml
# dubbo-demo/dubbo-demo-consumer/pom.xml
# dubbo-demo/dubbo-demo-provider/pom.xml
# dubbo-demo/pom.xml
# dubbo-filter/dubbo-filter-cache/pom.xml
# dubbo-filter/dubbo-filter-validation/pom.xml
# dubbo-filter/pom.xml
# dubbo-monitor/dubbo-monitor-api/pom.xml
# dubbo-monitor/dubbo-monitor-default/pom.xml
# dubbo-monitor/pom.xml
# dubbo-plugin/dubbo-qos/pom.xml
# dubbo-plugin/pom.xml
# dubbo-registry/dubbo-registry-api/pom.xml
# dubbo-registry/dubbo-registry-default/pom.xml
# dubbo-registry/dubbo-registry-multicast/pom.xml
# dubbo-registry/dubbo-registry-redis/pom.xml
# dubbo-registry/dubbo-registry-zookeeper/pom.xml
# dubbo-registry/pom.xml
# dubbo-remoting/dubbo-remoting-api/pom.xml
# dubbo-remoting/dubbo-remoting-grizzly/pom.xml
# dubbo-remoting/dubbo-remoting-http/pom.xml
# dubbo-remoting/dubbo-remoting-mina/pom.xml
# dubbo-remoting/dubbo-remoting-netty/pom.xml
# dubbo-remoting/dubbo-remoting-netty4/pom.xml
# dubbo-remoting/dubbo-remoting-p2p/pom.xml
# dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
# dubbo-remoting/pom.xml
# dubbo-rpc/dubbo-rpc-api/pom.xml
# dubbo-rpc/dubbo-rpc-dubbo/pom.xml
# dubbo-rpc/dubbo-rpc-hessian/pom.xml
# dubbo-rpc/dubbo-rpc-http/pom.xml
# dubbo-rpc/dubbo-rpc-injvm/pom.xml
# dubbo-rpc/dubbo-rpc-memcached/pom.xml
# dubbo-rpc/dubbo-rpc-redis/pom.xml
# dubbo-rpc/dubbo-rpc-rest/pom.xml
# dubbo-rpc/dubbo-rpc-rmi/pom.xml
# dubbo-rpc/dubbo-rpc-thrift/pom.xml
# dubbo-rpc/dubbo-rpc-webservice/pom.xml
# dubbo-rpc/pom.xml
# dubbo-serialization/dubbo-serialization-api/pom.xml
# dubbo-serialization/dubbo-serialization-fastjson/pom.xml
# dubbo-serialization/dubbo-serialization-fst/pom.xml
# dubbo-serialization/dubbo-serialization-hessian2/pom.xml
# dubbo-serialization/dubbo-serialization-jdk/pom.xml
# dubbo-serialization/dubbo-serialization-kryo/pom.xml
# dubbo-serialization/pom.xml
# dubbo-test/dubbo-test-benchmark/pom.xml
# dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml
# dubbo-test/dubbo-test-compatibility/pom.xml
# dubbo-test/dubbo-test-examples/pom.xml
# dubbo-test/dubbo-test-integration/pom.xml
# dubbo-test/pom.xml
# hessian-lite/pom.xml
# pom.xml
17 files changed:
all/pom.xml
bom/pom.xml
dependencies-bom/pom.xml
dubbo-common/pom.xml
dubbo-config/dubbo-config-spring/pom.xml
dubbo-container/dubbo-container-spring/pom.xml
dubbo-filter/dubbo-filter-cache/pom.xml
dubbo-filter/dubbo-filter-validation/pom.xml
dubbo-remoting/dubbo-remoting-http/pom.xml
dubbo-remoting/dubbo-remoting-netty4/pom.xml
dubbo-rpc/dubbo-rpc-hessian/pom.xml
dubbo-rpc/dubbo-rpc-http/pom.xml
dubbo-rpc/dubbo-rpc-redis/pom.xml
dubbo-rpc/dubbo-rpc-rest/pom.xml
dubbo-rpc/dubbo-rpc-webservice/pom.xml
dubbo-test/pom.xml
pom.xml