You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by je...@apache.org on 2018/10/08 07:15:52 UTC
[incubator-dubbo] 01/01: Merge branch '2.6.4-release' into 2.6.x
This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit f77c9fcc5ecfa10ce535a75b877bbce9ba078c70
Merge: 28e1037 d7af5d9
Author: zhuyong <yo...@alibaba-inc.com>
AuthorDate: Mon Oct 8 15:15:15 2018 +0800
Merge branch '2.6.4-release' into 2.6.x
CHANGES.md | 27 +++++++++++++++++++++-
NOTICE | 11 ++++++++-
all/pom.xml | 4 ++--
bom/pom.xml | 2 +-
dependencies-bom/pom.xml | 2 +-
distribution/pom.xml | 2 +-
dubbo-bootstrap/pom.xml | 2 +-
dubbo-cluster/pom.xml | 2 +-
dubbo-common/pom.xml | 2 +-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
.../alibaba/dubbo/config/spring/ConfigTest.java | 4 ++--
.../dubbo/config/spring/delay-fixed-time.xml | 2 +-
.../dubbo/config/spring/delay-on-initialized.xml | 2 +-
dubbo-config/pom.xml | 2 +-
dubbo-container/dubbo-container-api/pom.xml | 2 +-
dubbo-container/dubbo-container-log4j/pom.xml | 2 +-
dubbo-container/dubbo-container-logback/pom.xml | 2 +-
dubbo-container/dubbo-container-spring/pom.xml | 2 +-
dubbo-container/pom.xml | 2 +-
dubbo-demo/dubbo-demo-api/pom.xml | 2 +-
dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +-
dubbo-demo/dubbo-demo-provider/pom.xml | 2 +-
dubbo-demo/pom.xml | 2 +-
dubbo-filter/dubbo-filter-cache/pom.xml | 2 +-
dubbo-filter/dubbo-filter-validation/pom.xml | 2 +-
dubbo-filter/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-api/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +-
dubbo-monitor/pom.xml | 2 +-
dubbo-plugin/dubbo-qos/pom.xml | 2 +-
dubbo-plugin/pom.xml | 2 +-
dubbo-registry/dubbo-registry-api/pom.xml | 2 +-
dubbo-registry/dubbo-registry-default/pom.xml | 2 +-
dubbo-registry/dubbo-registry-multicast/pom.xml | 2 +-
dubbo-registry/dubbo-registry-redis/pom.xml | 2 +-
dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +-
dubbo-registry/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 2 +-
dubbo-remoting/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +-
.../dubbo/telnet/ChangeTelnetHandlerTest.java | 2 +-
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 12 +++++-----
dubbo-rpc/dubbo-rpc-hessian/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-rmi/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
dubbo-rpc/pom.xml | 2 +-
.../dubbo-serialization-api/pom.xml | 2 +-
.../dubbo-serialization-fastjson/pom.xml | 2 +-
.../dubbo-serialization-fst/pom.xml | 2 +-
.../dubbo-serialization-hessian2/pom.xml | 2 +-
.../dubbo-serialization-jdk/pom.xml | 2 +-
.../dubbo-serialization-kryo/pom.xml | 2 +-
dubbo-serialization/pom.xml | 2 +-
dubbo-test/dubbo-test-benchmark/pom.xml | 2 +-
.../dubbo-test-spring3/pom.xml | 2 +-
dubbo-test/dubbo-test-compatibility/pom.xml | 2 +-
dubbo-test/dubbo-test-examples/pom.xml | 2 +-
dubbo-test/dubbo-test-integration/pom.xml | 2 +-
dubbo-test/pom.xml | 4 ++--
pom.xml | 4 ++--
75 files changed, 118 insertions(+), 84 deletions(-)