diff --git a/trunk/conf/origin.cluster.serverA.conf b/trunk/conf/origin.cluster.serverA.conf index 7bc73c63a..c9b0efa06 100644 --- a/trunk/conf/origin.cluster.serverA.conf +++ b/trunk/conf/origin.cluster.serverA.conf @@ -15,6 +15,6 @@ vhost __defaultVhost__ { cluster { mode local; origin_cluster on; - coworkers 127.0.0.1:9090 127.0.0.1:9091 127.0.0.1:9092; + coworkers 127.0.0.1:9091 127.0.0.1:9092; } } diff --git a/trunk/conf/origin.cluster.serverB.conf b/trunk/conf/origin.cluster.serverB.conf index b06417cd8..fe65bb0a3 100644 --- a/trunk/conf/origin.cluster.serverB.conf +++ b/trunk/conf/origin.cluster.serverB.conf @@ -15,6 +15,6 @@ vhost __defaultVhost__ { cluster { mode local; origin_cluster on; - coworkers 127.0.0.1:9090 127.0.0.1:9091 127.0.0.1:9092; + coworkers 127.0.0.1:9090 127.0.0.1:9092; } } diff --git a/trunk/conf/origin.cluster.serverC.conf b/trunk/conf/origin.cluster.serverC.conf index efb991cc7..72bec36e5 100644 --- a/trunk/conf/origin.cluster.serverC.conf +++ b/trunk/conf/origin.cluster.serverC.conf @@ -15,6 +15,6 @@ vhost __defaultVhost__ { cluster { mode local; origin_cluster on; - coworkers 127.0.0.1:9090 127.0.0.1:9091 127.0.0.1:9092; + coworkers 127.0.0.1:9090 127.0.0.1:9091; } } diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index d59657dcf..aa2c42562 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -30,6 +30,8 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-10-27, Merge [#1963](https://github.com/ossrs/srs/pull/1963): Cluster: Origin server shouldn't be it's own coworker. v4.0.186 +* v4.0, 2021-10-25, Merge [#2692](https://github.com/ossrs/srs/pull/2692): API: Add server_id into http_hooks. v4.0.185 * v4.0, 2021-10-22, Merge [#2687](https://github.com/ossrs/srs/pull/2687): API: Always stat client event if auth fail. v4.0.183 * v4.0, 2021-10-20, Merge [#1758](https://github.com/ossrs/srs/pull/1758): JSON: Support escape special chars. v4.0.182 * v4.0, 2021-10-19, Merge [#1754](https://github.com/ossrs/srs/pull/1754): RTMP: If port is explicity set to 0, use default 1935. v4.0.181 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index ecb5d4d83..c37898b1d 100644 --- 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 184 +#define VERSION_REVISION 186 #endif