From 5a0a1a4b4542f057a772f97abda15fea36a5fbcc Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 12 May 2021 10:41:02 -0700 Subject: [PATCH] markdowns: rename "master" branch references to "main" Signed-off-by: Gyuho Lee --- CHANGELOG-3.1.md | 14 +++++++------- CHANGELOG-3.2.md | 26 +++++++++++++------------- CHANGELOG-3.3.md | 26 +++++++++++++------------- CHANGELOG-3.4.md | 10 +++++----- CHANGELOG-3.5.md | 8 ++++---- CHANGELOG-4.0.md | 2 +- CONTRIBUTING.md | 2 +- security/security-release-process.md | 2 +- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md index 540d4d800..18765392a 100644 --- a/CHANGELOG-3.1.md +++ b/CHANGELOG-3.1.md @@ -1,6 +1,6 @@ -Previous change logs can be found at [CHANGELOG-3.0](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.0.md). +Previous change logs can be found at [CHANGELOG-3.0](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.0.md). The minimum recommended etcd versions to run in **production** are 3.1.11+, 3.2.26+, and 3.3.11+. @@ -21,7 +21,7 @@ The minimum recommended etcd versions to run in **production** are 3.1.11+, 3.2. ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -44,7 +44,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.1.19...v3.1.20) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -88,7 +88,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.1.18...v3.1.19) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -130,7 +130,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.1.17...v3.1.18) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -214,7 +214,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.1.13...v3.1.14) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -254,7 +254,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.1.12...v3.1.13) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. diff --git a/CHANGELOG-3.2.md b/CHANGELOG-3.2.md index 18b4b612c..b6b2d2a39 100644 --- a/CHANGELOG-3.2.md +++ b/CHANGELOG-3.2.md @@ -1,6 +1,6 @@ -Previous change logs can be found at [CHANGELOG-3.1](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.1.md). +Previous change logs can be found at [CHANGELOG-3.1](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.1.md). The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+. @@ -90,7 +90,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.28...v3.2.29) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. - Add [`etcd_server_client_requests_total` with `"type"` and `"client_api_version"` labels](https://github.com/etcd-io/etcd/pull/11687). @@ -110,7 +110,7 @@ See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/ ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -150,7 +150,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change. ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -203,7 +203,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.24...v3.2.25) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -247,7 +247,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.23...v3.2.24) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -307,7 +307,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.22...v3.2.23) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -393,7 +393,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.18...v3.2.19) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -442,7 +442,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.17...v3.2.18) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -749,7 +749,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.5...v3.2.6) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -781,7 +781,7 @@ See [security doc](https://etcd.io/docs/latest/op-guide/security/) for more deta ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -900,7 +900,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.0...v3.2.1) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -943,7 +943,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.1.0...v3.2.0) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md index c3f9149f9..1f914fad7 100644 --- a/CHANGELOG-3.3.md +++ b/CHANGELOG-3.3.md @@ -1,6 +1,6 @@ -Previous change logs can be found at [CHANGELOG-3.2](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.2.md). +Previous change logs can be found at [CHANGELOG-3.2](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.2.md). The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+. @@ -166,7 +166,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.18...v3.3.19) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. - Add [`etcd_server_client_requests_total` with `"type"` and `"client_api_version"` labels](https://github.com/etcd-io/etcd/pull/11687). @@ -186,7 +186,7 @@ See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/ ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -236,7 +236,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.15...v3.3.16) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -348,7 +348,7 @@ NOTE: This patch release had to include some new features from 3.4, while trying ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -377,9 +377,9 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change. ### Package `pkg/adt` - Change [`pkg/adt.IntervalTree` from `struct` to `interface`](https://github.com/etcd-io/etcd/pull/10959). - - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/master/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). + - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/main/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). - Improve [`pkg/adt.IntervalTree` test coverage](https://github.com/etcd-io/etcd/pull/10959). - - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/master/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). + - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/main/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). - Fix [Red-Black tree to maintain black-height property](https://github.com/etcd-io/etcd/pull/10978). - Previously, delete operation violates [black-height property](https://github.com/etcd-io/etcd/issues/10965). @@ -405,7 +405,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.12...v3.3.13) an ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -487,7 +487,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.9...v3.3.10) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -534,7 +534,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.8...v3.3.9) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -671,7 +671,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.3...v3.3.4) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -734,7 +734,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.2...v3.3.3) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. @@ -866,7 +866,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.2.0...v3.3.0) and ### Metrics, Monitoring -See [List of metrics](https://github.com/etcd-io/etcd/tree/master/Documentation/metrics) for all metrics per release. +See [List of metrics](https://github.com/etcd-io/etcd/tree/main/Documentation/metrics) for all metrics per release. Note that any `etcd_debugging_*` metrics are experimental and subject to change. diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index 5772a136a..63926da1e 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -1,6 +1,6 @@ -Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.3.md). +Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.3.md). The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+. @@ -498,7 +498,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.0...v3.4.0) and - Make etcd server return `raft.ErrProposalDropped` on internal Raft proposal drop in [v3 applier](https://github.com/etcd-io/etcd/pull/9549) and [v2 applier](https://github.com/etcd-io/etcd/pull/9558). - e.g. a node is removed from cluster, or [`raftpb.MsgProp` arrives at current leader while there is an ongoing leadership transfer](https://github.com/etcd-io/etcd/issues/8975). - Add [`snapshot`](https://github.com/etcd-io/etcd/pull/9118) package for easier snapshot workflow (see [`godoc.org/github.com/etcd/clientv3/snapshot`](https://godoc.org/github.com/etcd-io/etcd/clientv3/snapshot) for more). -- Improve [functional tester](https://github.com/etcd-io/etcd/tree/master/functional) coverage: [proxy layer to run network fault tests in CI](https://github.com/etcd-io/etcd/pull/9081), [TLS is enabled both for server and client](https://github.com/etcd-io/etcd/pull/9534), [liveness mode](https://github.com/etcd-io/etcd/issues/9230), [shuffle test sequence](https://github.com/etcd-io/etcd/issues/9381), [membership reconfiguration failure cases](https://github.com/etcd-io/etcd/pull/9564), [disastrous quorum loss and snapshot recover from a seed member](https://github.com/etcd-io/etcd/pull/9565), [embedded etcd](https://github.com/etcd-io/etcd/pull/9572). +- Improve [functional tester](https://github.com/etcd-io/etcd/tree/main/functional) coverage: [proxy layer to run network fault tests in CI](https://github.com/etcd-io/etcd/pull/9081), [TLS is enabled both for server and client](https://github.com/etcd-io/etcd/pull/9534), [liveness mode](https://github.com/etcd-io/etcd/issues/9230), [shuffle test sequence](https://github.com/etcd-io/etcd/issues/9381), [membership reconfiguration failure cases](https://github.com/etcd-io/etcd/pull/9564), [disastrous quorum loss and snapshot recover from a seed member](https://github.com/etcd-io/etcd/pull/9565), [embedded etcd](https://github.com/etcd-io/etcd/pull/9572). - Improve [index compaction blocking](https://github.com/etcd-io/etcd/pull/9511) by using a copy on write clone to avoid holding the lock for the traversal of the entire index. - Update [JWT methods](https://github.com/etcd-io/etcd/pull/9883) to allow for use of any supported signature method/algorithm. - Add [Lease checkpointing](https://github.com/etcd-io/etcd/pull/9924) to persist remaining TTLs to the consensus log periodically so that long lived leases progress toward expiry in the presence of leader elections and server restarts. @@ -605,7 +605,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.0...v3.4.0) and - `"github.com/coreos/etcd/store"` to `"go.etcd.io/etcd/etcdserver/api/v2store"`. - Change [snapshot file permissions](https://github.com/etcd-io/etcd/pull/9977): On Linux, the snapshot file changes from readable by all (mode 0644) to readable by the user only (mode 0600). - Change [`pkg/adt.IntervalTree` from `struct` to `interface`](https://github.com/etcd-io/etcd/pull/10959). - - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/master/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). + - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/main/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). - Release branch `/version` defines version `3.4.x-pre`, instead of `3.4.y+git`. - Use `3.4.5-pre`, instead of `3.4.4+git`. @@ -875,9 +875,9 @@ Note: **v3.5 will deprecate `etcd --log-package-levels` flag for `capnslog`**; ` ### Package `pkg/adt` - Change [`pkg/adt.IntervalTree` from `struct` to `interface`](https://github.com/etcd-io/etcd/pull/10959). - - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/master/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). + - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/main/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). - Improve [`pkg/adt.IntervalTree` test coverage](https://github.com/etcd-io/etcd/pull/10959). - - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/master/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). + - See [`pkg/adt` README](https://github.com/etcd-io/etcd/tree/main/pkg/adt) and [`pkg/adt` godoc](https://godoc.org/go.etcd.io/etcd/pkg/adt). - Fix [Red-Black tree to maintain black-height property](https://github.com/etcd-io/etcd/pull/10978). - Previously, delete operation violates [black-height property](https://github.com/etcd-io/etcd/issues/10965). diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md index 14e6663f0..d5c7ffb16 100644 --- a/CHANGELOG-3.5.md +++ b/CHANGELOG-3.5.md @@ -1,6 +1,6 @@ -Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.4.md). +Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.4.md). The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+. @@ -64,9 +64,9 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.0...v3.5.0) and - Changed `pkg/flags` function signature to [support structured logger](https://github.com/etcd-io/etcd/pull/11616). - Previously, `SetFlagsFromEnv(prefix string, fs *flag.FlagSet) error`, now `SetFlagsFromEnv(lg *zap.Logger, prefix string, fs *flag.FlagSet) error`. - Previously, `SetPflagsFromEnv(prefix string, fs *pflag.FlagSet) error`, now `SetPflagsFromEnv(lg *zap.Logger, prefix string, fs *pflag.FlagSet) error`. -- ClientV3 supports [grpc resolver API](https://github.com/etcd-io/etcd/blob/master/client/v3/naming/resolver/resolver.go). - - Endpoints can be managed using [endpoints.Manager](https://github.com/etcd-io/etcd/blob/master/client/v3/naming/endpoints/endpoints.go) - - Previously supported [GRPCResolver was decomissioned](https://github.com/etcd-io/etcd/pull/12675). Use [resolver](https://github.com/etcd-io/etcd/blob/master/client/v3/naming/resolver/resolver.go) instead. +- ClientV3 supports [grpc resolver API](https://github.com/etcd-io/etcd/blob/main/client/v3/naming/resolver/resolver.go). + - Endpoints can be managed using [endpoints.Manager](https://github.com/etcd-io/etcd/blob/main/client/v3/naming/endpoints/endpoints.go) + - Previously supported [GRPCResolver was decomissioned](https://github.com/etcd-io/etcd/pull/12675). Use [resolver](https://github.com/etcd-io/etcd/blob/main/client/v3/naming/resolver/resolver.go) instead. - Turned on [--pre-vote by default](https://github.com/etcd-io/etcd/pull/12770). Should prevent disrupting RAFT leader by an individual member. - [ETCD_CLIENT_DEBUG env](https://github.com/etcd-io/etcd/pull/12786): Now supports log levels (debug, info, warn, error, dpanic, panic, fatal). Only when set, overrides application-wide grpc logging settings. - [Embed Etcd.Close()](https://github.com/etcd-io/etcd/pull/12828) needs to called exactly once and closes Etcd.Err() stream. diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md index 7df8c09cf..6b15f7237 100644 --- a/CHANGELOG-4.0.md +++ b/CHANGELOG-4.0.md @@ -1,6 +1,6 @@ -Previous change logs can be found at [CHANGELOG-3.x](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.x.md). +Previous change logs can be found at [CHANGELOG-3.x](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.x.md). The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 33422c2de..3b1d78dcf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ Reporting bugs is one of the best ways to contribute. However, a good bug report This is a rough outline of what a contributor's workflow looks like: -- Create a topic branch from where to base the contribution. This is usually master. +- Create a topic branch from where to base the contribution. This is usually main. - Make commits of logical units. - Make sure commit messages are in the proper format (see below). - Push changes in a topic branch to a personal fork of the repository. diff --git a/security/security-release-process.md b/security/security-release-process.md index 8b6fc3551..d029a8d8d 100644 --- a/security/security-release-process.md +++ b/security/security-release-process.md @@ -102,7 +102,7 @@ With the Fix Development underway, the PSC needs to come up with an overall comm **Fix Release Day** (Completed within 1-21 days of Disclosure) -- The PSC will cherry-pick the patches onto the master branch and all relevant release branches. The Fix Team will `lgtm` and `approve`. +- The PSC will cherry-pick the patches onto the main branch and all relevant release branches. The Fix Team will `lgtm` and `approve`. - The etcd maintainers will merge these PRs as quickly as possible. - The PSC will ensure all the binaries are built, publicly available, and functional. - The PSC will announce the new releases, the CVE number, severity, and impact, and the location of the binaries to get wide distribution and user action. As much as possible this announcement should be actionable, and include any mitigating steps users can take prior to upgrading to a fixed version. The recommended target time is 4pm UTC on a non-Friday weekday. This means the announcement will be seen morning Pacific, early evening Europe, and late evening Asia. The announcement will be sent via the following channels: