ken.lj dbca54ca23 Merge branch 'master' into dev-metadata ... # Conflicts: # dubbo-all/pom.xml # dubbo-bootstrap/pom.xml # dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfiguration.java # dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListenerTest.java # dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java		2018-11-15 11:33:24 +08:00
..
dubbo-qos	Merge branch 'master' into dev-metadata	2018-11-15 11:33:24 +08:00
pom.xml	Add compatible module and rename groupId to org.apache.dubbo (#1952)	2018-06-19 11:31:09 +08:00