Skip to content

[release/1.1] Fix options ordering in proto api txt files#2473

Merged
crosbymichael merged 1 commit intocontainerd:release/1.1from
dmcgowan:backport-proto-api-txt-files
Jul 18, 2018
Merged

[release/1.1] Fix options ordering in proto api txt files#2473
crosbymichael merged 1 commit intocontainerd:release/1.1from
dmcgowan:backport-proto-api-txt-files

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

An upstream change caused the options to now be ordered

Signed-off-by: Derek McGowan [email protected]
(cherry picked from commit d3cd5f1)
Signed-off-by: Derek McGowan [email protected]

An upstream change caused the options to now be ordered

Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit d3cd5f1)
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan added this to the 1.1.3 milestone Jul 17, 2018
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2473 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #2473   +/-   ##
============================================
  Coverage        50.13%   50.13%           
============================================
  Files               75       75           
  Lines             7295     7295           
============================================
  Hits              3657     3657           
  Misses            2964     2964           
  Partials           674      674
Flag Coverage Δ
#linux 50.13% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 468a545...68380d4. Read the comment docs.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit c938bbb into containerd:release/1.1 Jul 18, 2018
@dmcgowan dmcgowan deleted the backport-proto-api-txt-files branch September 10, 2019 17:47
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