Skip to content

misc: fix encryption stats nits.#26044

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
mberhault:marc/fix_encryption_stats_nits
May 24, 2018
Merged

misc: fix encryption stats nits.#26044
craig[bot] merged 1 commit intocockroachdb:masterfrom
mberhault:marc/fix_encryption_stats_nits

Conversation

@mberhault
Copy link
Copy Markdown
Contributor

Nothing major, followups to premature merge of #25850

Release note: None

Nothing major, followups to premature merge of cockroachdb#25850

Release note: None
@mberhault mberhault requested review from a team and petermattis May 24, 2018 17:00
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@petermattis
Copy link
Copy Markdown
Collaborator

:lgtm:


Review status: 0 of 2 files reviewed at latest revision, all discussions resolved, all commit checks successful.


Comments from Reviewable

@mberhault
Copy link
Copy Markdown
Contributor Author

bors r+

@buydeal
Copy link
Copy Markdown

buydeal commented May 24, 2018 via email

craig bot pushed a commit that referenced this pull request May 24, 2018
26044: misc: fix encryption stats nits. r=mberhault a=mberhault

Nothing major, followups to premature merge of #25850

Release note: None

26048: tpccbench: fix existing dataset fast-path r=nvanbenschoten a=nvanbenschoten

This skewed with #24735, which changed the output of `information_schema`
when connecting to an implicit database.

Release note: None

Co-authored-by: marc <marc@cockroachlabs.com>
Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 24, 2018

Build succeeded

@craig craig bot merged commit 93c6f2a into cockroachdb:master May 24, 2018
@mberhault mberhault deleted the marc/fix_encryption_stats_nits branch May 24, 2018 20:49
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.

4 participants