Skip to content

Commit d6faa92

Browse files
committedJun 6, 2018
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
2 parents 5856d4f + 1e729af commit d6faa92

File tree

74 files changed

+2476
-2145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2476
-2145
lines changed
 

‎CHANGES.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Release Notes
2+
3+
## 2.6.2
4+
5+
1. Hessian-lite serialization: revert locale serialization for compatibility, #1413
6+
2. Asset transfer to ASF, includeing pom, license, DISCLAIMER and so on, #1491
7+
3. Introduce of new dispatcher policy: EagerThreadpool, #1568
8+
4. Separate monitor data with group and version, #1407
9+
5. Spring Boot Enhancenment, #1611
10+
6. Gaceful shutdown enhancement
11+
- Remove exporter destroy logic in AnnotationBean.
12+
- Waiting for registry notification on consumer side by checking channel state.
13+
7. Simplify consumer/provider side check in RpcContext, #1444.
14+
15+
Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15).

‎CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434

3535
## Enforcement
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dubbo@googlegroups.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at dev@dubbo.apache.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
3838

3939
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
4040

0 commit comments

Comments
 (0)
Please sign in to comment.