This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch dev-metadata in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 75853a88698e2f83a1dae2ba028e4a2316eab326 Merge: 0242852 ec66820 Author: ken.lj <[email protected]> AuthorDate: Fri Sep 7 16:41:41 2018 +0800 Merge branch 'master' into dev-metadata # Conflicts: # dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java .travis.yml | 2 +- README.md | 59 ++++- .../apache/dubbo/rpc/cluster/RouterFactory.java | 3 +- .../cluster/configurator/AbstractConfigurator.java | 5 +- .../loadbalance/LeastActiveLoadBalance.java | 8 +- .../rpc/cluster/loadbalance/RandomLoadBalance.java | 8 +- .../cluster/support/AbstractClusterInvoker.java | 5 +- .../cluster/support/FailbackClusterInvoker.java | 5 +- .../cluster/support/FailfastClusterInvoker.java | 8 +- .../cluster/support/FailoverClusterInvoker.java | 4 +- .../rpc/cluster/support/ForkingClusterInvoker.java | 7 +- .../cluster/support/ForkingClusterInvokerTest.java | 22 +- .../dubbo/common/compiler/support/ClassUtils.java | 66 ++--- .../org/apache/dubbo/common/io/StreamUtils.java | 6 + .../apache/dubbo/common/io/StreamUtilsTest.java | 47 +++- .../org/apache/dubbo/config/ApplicationConfig.java | 13 + .../org/apache/dubbo/config/ReferenceConfig.java | 8 +- .../src/main/resources/META-INF/compat/dubbo.xsd | 6 + .../org/apache/dubbo/qos/server/DubboLogo.java | 16 +- .../apache/dubbo/registry/redis/RedisRegistry.java | 12 +- .../org/apache/dubbo/remoting/Transporter.java | 6 +- .../support/header/HeaderExchangeChannelTest.java | 284 +++++++++++++++++++++ .../exchange/support/header/MockChannel.java | 4 + .../java/org/apache/dubbo/rpc/InvokerListener.java | 3 +- .../hessian/HttpClientConnectionFactory.java | 3 - pom.xml | 15 +- 26 files changed, 484 insertions(+), 141 deletions(-) diff --cc dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java index a7e588c,c81ba54..4d35c78 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java @@@ -19,8 -19,6 +19,7 @@@ package org.apache.dubbo.rpc.cluster import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Adaptive; import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.config.dynamic.DynamicConfiguration; - import org.apache.dubbo.rpc.Invocation; /** * RouterFactory. (SPI, Singleton, ThreadSafe)
