From 8b91b431d56404052f5d98eeee4e8d402dd802dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= <wu.sheng@foxmail.com>
Date: Wed, 27 Jun 2018 14:04:11 +0800
Subject: [PATCH] Add CHANGELOG for beta2  (#1388)

* Prepare beta2 changelogs.
---
 CHANGES.md        | 79 ++++++++++++++++++++++++++++++++++++++++++-----
 docs/README_ZH.md |  2 ++
 2 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3d6d215456..6d77b66b00 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,72 @@
- Changes by Version
- ==================
- Release Notes.
+Changes by Version
+==================
+Release Notes.
+
+5.0.0-beta2
+------------------
+
+#### UI -> Collector GraphQL query protocol
+  - Add order and status in trace query. 
+
+#### Agent Changes
+  - Add SOFA plugin.
+  - Add witness class for Kafka plugin.
+  - Add RuntimeContext in Context.
+  - Fix RuntimeContext fail in Tomcat plugin. 
+  - Fix incompatible for `getPropertyDescriptors` in Spring core. 
+  - Fix spymemcached plugin bug.
+  - Fix database URL parser bug.
+  - Fix `StringIndexOutOfBoundsException` when mysql jdbc url without databaseName。
+  - Fix duplicate slash in Spring MVC plugin bug.
+  - Fix namespace bug.
+  - Fix NPE in Okhttp plugin when connect failed.
+  - FIx `MalformedURLException` in httpClientComponent plugin. 
+  - Remove unused dependencies in Dubbo plugin.
+  - Remove gRPC timeout to avoid out of memory leak.
+  - Rewrite Async http client plugin.
+  - [Incubating] Add trace custom ignore optional plugin. 
+
+#### Collector Changes
+  - Topology query optimization for more than 100 apps.
+  - Tolerate unsupported segments.
+  - Support Integer Array, Long Array, String Array, Double Array in streaming data model.
+  - Support multiple entry span and multiple service name in one segment durtaion record.
+  - Use BulkProcessor to control the linear writing of data by multiple threads.
+  - Determine the log is enabled for the DEBUG level before printing message.
+  - Add `static` modifier to Logger. 
+  - Add AspNet component.
+  - Filter inactive service in query.
+  - Support to query service based on Application.
+  - Fix `RemoteDataMappingIdNotFoundException`
+  - Exclude component-libaries.xml file in collector-*.jar, make sure it is in `/conf` only. 
+  - Separate a single TTL in minute to in minute, hour, day, month metric and trace.
+  - Add order and status in trace query. 
+  - Add folder lock to buffer folder.
+  - Modify operationName search from `match` to `match_phrase`.
+  - [Incubating] Add Zipkin span receiver. Support analysis Zipkin v1/v2 formats.
+  - [Incubating] Support sharding-sphere as storage implementor.
+  
+#### UI Changes
+  - Support login and access control.
+  - Add new webapp.yml configuration file.
+  - Modify webapp startup script.
+  - Link to trace query from Thermodynamic graph
+  - Add application selector in service view.
+  - Add order and status in trace query.
+  
+#### Documents
+  - Add architecture design doc.
+  - Reformat deploy document. 
+  - Adjust Tomcat deploy document.
+  - Remove all Apache licenses files in dist release packages.
+  - Update user cases.
+  - Update UI licenses.
+  - Add incubating sections in doc.
+
+[Issues and Pull requests](https://github.com/apache/incubator-skywalking/milestone/28)
   
- 5.0.0-beta
- ------------------
+5.0.0-beta
+------------------
  
 #### UI -> Collector GraphQL query protocol
   - Replace all tps to throughtput/cpm(calls per min)
@@ -62,10 +125,10 @@
    - Add a FAQ about, `Agent or collector version upgrade`.
    - Sync all English document to Chinese.
  
-  [Issues and Pull requests](https://github.com/apache/incubator-skywalking/milestone/24)
+[Issues and Pull requests](https://github.com/apache/incubator-skywalking/milestone/24)
  
- 5.0.0-alpha
- ------------------
+5.0.0-alpha
+------------------
  
 #### Agent -> Collector protocol
  - Remove C++ keywords
diff --git a/docs/README_ZH.md b/docs/README_ZH.md
index 0e51bce91e..55230f195e 100644
--- a/docs/README_ZH.md
+++ b/docs/README_ZH.md
@@ -1,6 +1,8 @@
 ## 中文文档
 [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](README.md)
 
+注：中文文档由社区志愿者提供，官方文档以英文为准。
+
   * 快速入门
     * [快速入门](cn/Quick-start-CN.md)
     * [中间件，框架与类库支持列表](Supported-list.md)
-- 
GitLab