From 9cc4f933a28a0c75ede2cd20bb1161fc431fa8e6 Mon Sep 17 00:00:00 2001 From: cvictory Date: Mon, 12 Nov 2018 11:20:56 +0800 Subject: [PATCH] 2.6.5 release note change (#2775) * release 2.6.5 * edit release note for 2.6.5 (rewrite log) * mmm * edit release note to remove some unuseful word * merge from upstream and origin --- CHANGES.md | 6 +++--- .../main/java/com/alibaba/dubbo/demo/consumer/Consumer.java | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a9b1e20cdaf..e95ea44fca5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,8 +6,8 @@ Enhancements / Features： - Reactor the generation rule for @Service Bean name [#2235](https://github.com/apache/incubator-dubbo/issues/2235) - Introduce a new Spring ApplicationEvent for ServiceBean exporting [#2251](https://github.com/apache/incubator-dubbo/issues/2251) -- [Enhancement] the algorithm of load issue on Windows good first issue help wanted. [#1641](https://github.com/apache/incubator-dubbo/issues/1641) -- add javadoc to dubbo-all module good first issue help wanted. [#2600](https://github.com/apache/incubator-dubbo/issues/2600) +- [Enhancement] the algorithm of load issue on Windows. [#1641](https://github.com/apache/incubator-dubbo/issues/1641) +- add javadoc to dubbo-all module good first issue. [#2600](https://github.com/apache/incubator-dubbo/issues/2600) - [Enhancement] Reactor the generation rule for @Service Bean name type/enhancement [#2235](https://github.com/apache/incubator-dubbo/issues/2235) - Optimize LeastActiveLoadBalance and add weight test case. [#2540](https://github.com/apache/incubator-dubbo/issues/2540) - Smooth Round Robin selection. [#2578](https://github.com/apache/incubator-dubbo/issues/2578) [#2647](https://github.com/apache/incubator-dubbo/pull/2647) @@ -114,4 +114,4 @@ Issues and Pull Requests, check [milestone-2.6.3](https://github.com/apache/incu - Waiting for registry notification on consumer side by checking channel state. 7. Simplify consumer/provider side check in RpcContext, #1444. -Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15). \ No newline at end of file +Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15). diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java b/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java index 9caacbc7ad7..66f72e86f36 100644 --- a/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java +++ b/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java @@ -38,8 +38,6 @@ public static void main(String[] args) { } catch (Throwable throwable) { throwable.printStackTrace(); } - - } }