diff --git a/command/agent/rpc.go b/command/agent/rpc.go index 81beff6620..e64084d177 100644 --- a/command/agent/rpc.go +++ b/command/agent/rpc.go @@ -131,8 +131,6 @@ type KeyringInfo struct { Datacenter string Pool string NumNodes int - NumResp int - NumErr int Error string } @@ -686,8 +684,6 @@ func (i *AgentRPC) handleKeyring(client *rpcClient, seq uint64, cmd string) erro Datacenter: kr.Datacenter, Pool: pool, NumNodes: kr.NumNodes, - NumResp: kr.NumResp, - NumErr: kr.NumErr, Error: kr.Error, } r.Info = append(r.Info, info) diff --git a/consul/internal_endpoint.go b/consul/internal_endpoint.go index 2cd08a2c65..a1a170f772 100644 --- a/consul/internal_endpoint.go +++ b/consul/internal_endpoint.go @@ -81,9 +81,7 @@ func (m *Internal) ingestKeyringResponse( Datacenter: m.srv.config.Datacenter, Messages: serfResp.Messages, Keys: serfResp.Keys, - NumResp: serfResp.NumResp, NumNodes: serfResp.NumNodes, - NumErr: serfResp.NumErr, Error: errStr, }) } diff --git a/consul/structs/structs.go b/consul/structs/structs.go index 6e752ea4f3..2557bfc399 100644 --- a/consul/structs/structs.go +++ b/consul/structs/structs.go @@ -548,8 +548,6 @@ type KeyringResponse struct { Messages map[string]string Keys map[string]int NumNodes int - NumResp int - NumErr int Error string } diff --git a/website/source/docs/commands/keyring.html.markdown b/website/source/docs/commands/keyring.html.markdown index 6a635746c2..03b1d6c25c 100644 --- a/website/source/docs/commands/keyring.html.markdown +++ b/website/source/docs/commands/keyring.html.markdown @@ -14,9 +14,7 @@ distributing new encryption keys to the cluster, retiring old encryption keys, and changing the keys used by the cluster to encrypt messages. Because Consul utilizes multiple gossip pools, this command will only operate -against a server node for most operations. By default, all operations carried -out by this command are run against the LAN gossip pool in the datacenter of the -agent. +against a server node for most operations. Consul allows multiple encryption keys to be in use simultaneously. This is intended to provide a transition state while the cluster converges. It is the