Skip to content

[release/1.0] Fix options ordering in proto api txt files#2780

Merged
estesp merged 1 commit intocontainerd:release/1.0from
thaJeztah:1.0_backport_fix_checkprotos
Nov 10, 2018
Merged

[release/1.0] Fix options ordering in proto api txt files#2780
estesp merged 1 commit intocontainerd:release/1.0from
thaJeztah:1.0_backport_fix_checkprotos

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Backport of #2470 for the release/1.0 branch;

git checkout -b 1.0_backport_fix_checkprotos upstream/release/1.0
git cherry-pick -s -S -x d3cd5f1d015da1f8a9107f0b58b9c614c4b153cf

cherry-pick was clean; no conflicts

An upstream change caused the options to now be ordered

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: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @dmcgowan @AkihiroSuda ptal

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2780 into release/1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2780   +/-   ##
============================================
  Coverage        50.95%   50.95%           
============================================
  Files               81       81           
  Lines             7205     7205           
============================================
  Hits              3671     3671           
  Misses            2833     2833           
  Partials           701      701
Flag Coverage Δ
#linux 50.95% <ø> (ø) ⬆️

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 624dc54...ae4e236. 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

@estesp estesp merged commit 178c7c3 into containerd:release/1.0 Nov 10, 2018
@thaJeztah thaJeztah deleted the 1.0_backport_fix_checkprotos branch November 11, 2018 00:35
@thaJeztah
Copy link
Copy Markdown
Member Author

Thanks!

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.

5 participants