Squash: Merge SRS 4.0

4 years ago · 1c80b529f8
parent 0efd7b1bbc
commit 1c80b529f8
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -20,6 +20,7 @@ The changelog for SRS.

 ## SRS 4.0 Changelog

+* v4.0, 2021-07-24, Merge [#2483](https://github.com/ossrs/srs/pull/2483), RTC: Support statistic for HTTP-API, HTTP-Callback and Security. 4.0.144
 * v4.0, 2021-07-21, Merge [#2474](https://github.com/ossrs/srs/pull/2474), SRT: Use thread-safe log for multiple-threading SRT module. 4.0.143
 * v4.0, 2021-07-17, Fix bugs and enhance code. 4.0.142
 * v4.0, 2021-07-16, Support [CLion and cmake](https://github.com/ossrs/srs/wiki/v4_CN_IDE#clion) to build and debug SRS. 4.0.141
--- a/trunk/src/core/srs_core_version4.hpp
+++ b/trunk/src/core/srs_core_version4.hpp
@ -9,6 +9,6 @@

 #define VERSION_MAJOR       4
 #define VERSION_MINOR       0
-#define VERSION_REVISION    143
+#define VERSION_REVISION    144

 #endif