Merge branch 'master' into sample-for-2.7.0-SNAPSHOT
authorken.lj <ken.lj.hz@gmail.com>
Fri, 29 Jun 2018 06:39:30 +0000 (14:39 +0800)
committerken.lj <ken.lj.hz@gmail.com>
Fri, 29 Jun 2018 06:39:30 +0000 (14:39 +0800)
commitf3d6dd0d130ff42b14d6f87675ba1476fc1288ed
tree250b42ed3475fadf13055fb33b3c09798b3ea2f2
parent08518e40c118504b5dbfda099e48333bfbea13ab
parent99be260867b36fdc59722f8817122456c3b3b4a9
Merge branch 'master' into sample-for-2.7.0-SNAPSHOT

# Conflicts:
# README.md
# pom.xml
dubbo-samples-async/src/main/java/com/alibaba/dubbo/samples/async/AsyncConsumer.java
dubbo-samples-attachment/src/main/java/com/alibaba/dubbo/samples/attachment/AttachmentConsumer.java
dubbo-samples-context/src/main/java/com/alibaba/dubbo/samples/context/ContextConsumer.java
dubbo-samples-rest/pom.xml
dubbo-samples-rest/src/main/java/com/alibaba/dubbo/samples/rest/RestConsumer.java
dubbo-samples-rest/src/main/java/com/alibaba/dubbo/samples/rest/RestProvider.java
pom.xml