Merge pull request cockroachdb#12301 from irfansharif/feat/distsql-di…

…stinct-spec

distsql: simplification of DISTINCT spec

Merge pull request cockroachdb#12167 from knz/fix-order-by-count

sql: fix the ordering by COUNT(*).

Merge pull request cockroachdb#11728 from a-robinson/isolatedaddr

gossip/simulation: Use IsolatedTestAddr to avoid running out of ports

Merge pull request cockroachdb#10530 from bdarnell/update-etcd

build: Update etcd

Merge pull request cockroachdb#10395 from bdarnell/bdarnell/disable-p…

…revote

storage: Switch back from PreVote to CheckQuorum

Merge pull request cockroachdb#10207 from cockroachdb/spencerkimball/…

…ambiguous-commit

Re-merge ambiguous commit error PR with locking fixes

Merge pull request cockroachdb#9860 from BramGruneir/9782

roachpb, server, storage, ui: move locality from store to node descriptor

Merge pull request cockroachdb#9667 from nvanbenschoten/nvanbenschote…

…n/bumpTools

build: Bump golang.org/x/tools dependency to latest version

Merge pull request cockroachdb#9615 from cuongdo/fix_terraform_0.7.4

acceptance+cloud: fix for Terraform 0.7.4

Merge pull request cockroachdb#9362 from tamird/deprecated-request

roachpb: treat DeprecatedVerifyChecksumRequest as NoopRequest