merge from project cn

translatecn · Feb 8, 2023 · b98574d · b98574d
1 parent 586eacc
commit b98574d
Show file tree

Hide file tree

Showing 1,755 changed files with 73,852 additions and 228,530 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -8,30 +8,16 @@
 *.etcd
 *.log
 *.swp
-/etcd
 /hack/insta-discovery/.env
 *.coverprofile
 *.test
 hack/tls-setup/certs
-.idea
-*.iml
-/contrib/mixin/manifests
 /contrib/raftexample/raftexample
 /contrib/raftexample/raftexample-*
 /vendor
 /tests/e2e/default.proxy
 *.tmp
 *.bak
 .gobincache/
-.DS_Store
-/Documentation/dev-guide/api_reference_v3.md
-/Documentation/dev-guide/api_concurrency_reference_v3.md
-
-/tools/etcd-dump-db/etcd-dump-db
-/tools/etcd-dump-logs/etcd-dump-logs
-/tools/etcd-dump-metrics/etcd-dump-metrics
-/tools/local-tester/bridge/bridge
-/tools/proto-annotations/proto-annotations
-/tools/benchmark/benchmark
-/out
-/etcd-dump-logs
+default.etcd
+raftexample/db/*
diff --git a/.golangci.yaml b/.golangci.yaml
diff --git a/.header b/.header
diff --git a/ADOPTERS.md b/ADOPTERS.md
diff --git a/CHANGELOG/CHANGELOG-2.3.md b/CHANGELOG/CHANGELOG-2.3.md