Code

Bump etcd to v3.1.0 GA#12600

Code

Merged

openshift-bot merged 4 commits intoopenshift:masteropenshift/origin:masterfrom smarterclayton:bump_etcd_310smarterclayton/origin:bump_etcd_310Copy head branch name to clipboardJan 24, 2017

+5,897-4,083

Commits

Commits on Jan 22, 2017

• UPSTREAM: <drop>: Workaround etcd310 / gprc version conflict with CRI

  smarterclayton

  committed
  42d451c

  Copy full SHA for 42d451c

• UPSTREAM: coreos/rkt: <drop>: Workaround etcd310 / grpc incompat

  smarterclayton

  committed
  c02efd1

  Copy full SHA for c02efd1

• Origin does not compile on Macs

  smarterclayton

  committed
  383d1df

  Copy full SHA for 383d1df

• bump(github.com/coreos/etcd):v3.1.0

  smarterclayton

  committed
  e22997b

  Copy full SHA for e22997b