From cb1a1426b1f27dde2a9053fdc7db80c348b5275a Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Thu, 30 Jun 2016 09:39:52 -0700 Subject: [PATCH 1/2] *: remove beta from docs --- Documentation/op-guide/container.md | 2 +- etcdctl/README.md | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/op-guide/container.md b/Documentation/op-guide/container.md index 24b0a43d9..e66c4578f 100644 --- a/Documentation/op-guide/container.md +++ b/Documentation/op-guide/container.md @@ -8,7 +8,7 @@ In order to expose the etcd API to clients outside of Docker host, use the host ``` # For each machine -ETCD_VERSION=v3.0.0-beta.0 +ETCD_VERSION=v3.0.0 TOKEN=my-etcd-token CLUSTER_STATE=new NAME_1=etcd-node-0 diff --git a/etcdctl/README.md b/etcdctl/README.md index 2fe949b67..b1088acb2 100644 --- a/etcdctl/README.md +++ b/etcdctl/README.md @@ -497,25 +497,25 @@ ENDPOINT STATUS does not support protobuf encoded output. ```bash ./etcdctl endpoint status -127.0.0.1:2379, 8211f1d0f64f3269, 3.0.0-beta.0+git, 25 kB, false, 2, 63 -127.0.0.1:22379, 91bc3c398fb3c146, 3.0.0-beta.0+git, 25 kB, false, 2, 63 -127.0.0.1:32379, fd422379fda50e48, 3.0.0-beta.0+git, 25 kB, true, 2, 63 +127.0.0.1:2379, 8211f1d0f64f3269, 3.0.0, 25 kB, false, 2, 63 +127.0.0.1:22379, 91bc3c398fb3c146, 3.0.0, 25 kB, false, 2, 63 +127.0.0.1:32379, fd422379fda50e48, 3.0.0, 25 kB, true, 2, 63 ``` ```bash ./etcdctl -w json endpoint status -[{"Endpoint":"127.0.0.1:2379","Status":{"header":{"cluster_id":17237436991929493444,"member_id":9372538179322589801,"revision":2,"raft_term":2},"version":"2.3.0+git","dbSize":24576,"leader":18249187646912138824,"raftIndex":32623,"raftTerm":2}},{"Endpoint":"127.0.0.1:22379","Status":{"header":{"cluster_id":17237436991929493444,"member_id":10501334649042878790,"revision":2,"raft_term":2},"version":"2.3.0+git","dbSize":24576,"leader":18249187646912138824,"raftIndex":32623,"raftTerm":2}},{"Endpoint":"127.0.0.1:32379","Status":{"header":{"cluster_id":17237436991929493444,"member_id":18249187646912138824,"revision":2,"raft_term":2},"version":"2.3.0+git","dbSize":24576,"leader":18249187646912138824,"raftIndex":32623,"raftTerm":2}}] +[{"Endpoint":"127.0.0.1:2379","Status":{"header":{"cluster_id":17237436991929493444,"member_id":9372538179322589801,"revision":2,"raft_term":2},"version":"3.0.0","dbSize":24576,"leader":18249187646912138824,"raftIndex":32623,"raftTerm":2}},{"Endpoint":"127.0.0.1:22379","Status":{"header":{"cluster_id":17237436991929493444,"member_id":10501334649042878790,"revision":2,"raft_term":2},"version":"3.0.0","dbSize":24576,"leader":18249187646912138824,"raftIndex":32623,"raftTerm":2}},{"Endpoint":"127.0.0.1:32379","Status":{"header":{"cluster_id":17237436991929493444,"member_id":18249187646912138824,"revision":2,"raft_term":2},"version":"3.0.0","dbSize":24576,"leader":18249187646912138824,"raftIndex":32623,"raftTerm":2}}] ``` ```bash ./etcdctl -w table endpoint status -+-----------------+------------------+------------------+---------+-----------+-----------+------------+ -| ENDPOINT | ID | VERSION | DB SIZE | IS LEADER | RAFT TERM | RAFT INDEX | -+-----------------+------------------+------------------+---------+-----------+-----------+------------+ -| 127.0.0.1:2379 | 8211f1d0f64f3269 | 3.0.0-beta.0+git | 25 kB | false | 2 | 52 | -| 127.0.0.1:22379 | 91bc3c398fb3c146 | 3.0.0-beta.0+git | 25 kB | false | 2 | 52 | -| 127.0.0.1:32379 | fd422379fda50e48 | 3.0.0-beta.0+git | 25 kB | true | 2 | 52 | -+-----------------+------------------+------------------+---------+-----------+-----------+------------+ ++-----------------+------------------+---------+---------+-----------+-----------+------------+ +| ENDPOINT | ID | VERSION | DB SIZE | IS LEADER | RAFT TERM | RAFT INDEX | ++-----------------+------------------+---------+---------+-----------+-----------+------------+ +| 127.0.0.1:2379 | 8211f1d0f64f3269 | 3.0.0 | 25 kB | false | 2 | 52 | +| 127.0.0.1:22379 | 91bc3c398fb3c146 | 3.0.0 | 25 kB | false | 2 | 52 | +| 127.0.0.1:32379 | fd422379fda50e48 | 3.0.0 | 25 kB | true | 2 | 52 | ++-----------------+------------------+---------+---------+-----------+-----------+------------+ ``` ### LOCK \ From 4cd834910ea736671d7fa878a7bd14636b66bd2d Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Thu, 30 Jun 2016 09:40:14 -0700 Subject: [PATCH 2/2] version: bump to v3.0.0+git --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 884d0ca94..6f4feacf3 100644 --- a/version/version.go +++ b/version/version.go @@ -29,7 +29,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "2.3.0" - Version = "3.0.0-beta.0+git" + Version = "3.0.0+git" // Git SHA Value will be set during build GitSHA = "Not provided (use ./build instead of go build)"