Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport-2.1: assorted backports #29630

Merged
merged 3 commits into from
Sep 6, 2018

Conversation

tbg
Copy link
Member

@tbg tbg commented Sep 6, 2018

Backport:

Please see individual PRs for details.

/cc @cockroachdb/release

We know it fails; we are not looking into it right now due to other priorities.
This should be investigated and fixed in the course of cockroachdb#29290.

Closes cockroachdb#29232.
Closes cockroachdb#29327.

Release note: None
This test has no chance of passing until Kafka chaos is actually
supported (see cockroachdb#28636).

Touches cockroachdb#29196.

Release note: None
upstream moved from github.com/etcd to go.etcd.io/etcd. We're going
to have to pick up an update soon to fix cockroachdb#28918, so it's easier to
switch now.

We're not picking up any new commits except for the renames.

Release note: None
@tbg tbg requested a review from a team September 6, 2018 10:49
@tbg tbg requested a review from a team as a code owner September 6, 2018 10:49
@tbg tbg requested a review from a team September 6, 2018 10:49
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@petermattis petermattis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 1 stale)

@tbg
Copy link
Member Author

tbg commented Sep 6, 2018

TFTR!

@tbg tbg merged commit a133232 into cockroachdb:release-2.1 Sep 6, 2018
@tbg tbg deleted the backport2.1-29511-29546-29574 branch September 6, 2018 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants