Merge branch 'master' into feature-portal-rest-pool-config

# Conflicts:
#	CHANGES.md

CHANGES.md

@@ -2,19 +2,10 @@ Changes by Version
 ==================
 Release Notes.
 
-Apollo 2.3.0
+Apollo 2.4.0
 
 ------------------
-* [Fix circular references on LdapAutoConfiguration](https://github.com/apolloconfig/apollo/pull/5055)
-* [Add comment for clusters and UI display](https://github.com/apolloconfig/apollo/pull/5072)
-* [Fix the issue that the length of private namespaces are mis-calculated](https://github.com/apolloconfig/apollo/pull/5078)
-* [apollo assembly optimization](https://github.com/apolloconfig/apollo/pull/5035)
-* [update the config item table column width](https://github.com/apolloconfig/apollo/pull/5131)
-* [sync apollo portal server config to apollo quick start server](https://github.com/apolloconfig/apollo/pull/5134)
-* [Fix the role permission deletion issue when appid contains '_'](https://github.com/apolloconfig/apollo/pull/5150)
-* [fix: -XX:HeapDumpPath doesn't ready when meet OOM](https://github.com/apolloconfig/apollo/pull/5157)
-* [Fix the error occurred when using configuration retention feature](https://github.com/apolloconfig/apollo/pull/5162)
-* [Feature support portal restTemplate Client connection pool config](https://github.com/apolloconfig/apollo/pull/5200)
+* [Update the server config link in system info page](https://github.com/apolloconfig/apollo/pull/5204)
 
 ------------------
-All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/14?closed=1)
+All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/15?closed=1)

apollo-portal/src/main/resources/static/system_info.html

@@ -43,7 +43,7 @@ <h3>{{'SystemInfo.Title' | translate }}
                     </h3>
                     <h6 ng-show="systemInfo.version">{{'SystemInfo.SystemVersion' | translate }}: {{systemInfo.version}}
                     </h6>
-                    <h6 translate="SystemInfo.Tips1" translate-value-server-config-url="server_config.html"
+                    <h6 translate="SystemInfo.Tips1" translate-value-server-config-url="server_config_manage.html"
                         translate-value-wiki-url="https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide">
                     </h6>
 

changes/changes-2.3.0.md

@@ -0,0 +1,19 @@
+Changes by Version
+==================
+Release Notes.
+
+Apollo 2.3.0
+
+------------------
+* [Fix circular references on LdapAutoConfiguration](https://github.com/apolloconfig/apollo/pull/5055)
+* [Add comment for clusters and UI display](https://github.com/apolloconfig/apollo/pull/5072)
+* [Fix the issue that the length of private namespaces are mis-calculated](https://github.com/apolloconfig/apollo/pull/5078)
+* [apollo assembly optimization](https://github.com/apolloconfig/apollo/pull/5035)
+* [update the config item table column width](https://github.com/apolloconfig/apollo/pull/5131)
+* [sync apollo portal server config to apollo quick start server](https://github.com/apolloconfig/apollo/pull/5134)
+* [Fix the role permission deletion issue when appid contains '_'](https://github.com/apolloconfig/apollo/pull/5150)
+* [fix: -XX:HeapDumpPath doesn't ready when meet OOM](https://github.com/apolloconfig/apollo/pull/5157)
+* [Fix the error occurred when using configuration retention feature](https://github.com/apolloconfig/apollo/pull/5162)
+
+------------------
+All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/14?closed=1)

pom.xml

@@ -60,7 +60,7 @@
 	</developers>
 
 	<properties>
-		<revision>2.3.0</revision>
+		<revision>2.4.0-SNAPSHOT</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<apollo-java.version>2.2.0</apollo-java.version>