Skip to content

Fix format on CI.#222

Merged
reyang merged 3 commits into
open-telemetry:masterfrom
g-easy:format
Jul 29, 2020
Merged

Fix format on CI.#222
reyang merged 3 commits into
open-telemetry:masterfrom
g-easy:format

Conversation

@g-easy
Copy link
Copy Markdown
Contributor

@g-easy g-easy commented Jul 28, 2020

Exclude CRLF files when changing line endings.

g-easy added 2 commits July 28, 2020 19:19
@g-easy
Fix format on CI.
f4489a4 
"git add" makes "git ls-files -m" output always empty.
@g-easy
Exclude CRLF files when changing line endings.
3c2438f
@g-easy g-easy requested a review from a team July 28, 2020 09:25
@g-easy g-easy mentioned this pull request Jul 28, 2020
Merged
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 28, 2020 •
edited
Loading

Codecov Report

Merging #222 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #222   +/-   ##
=======================================
  Coverage   93.75%   93.75%           
=======================================
  Files         104      104           
  Lines        3249     3249           
=======================================
  Hits         3046     3046           
  Misses        203      203

@reyang reyang added the pr:do-not-merge This PR is not ready to be merged. label Jul 29, 2020
@pyohannes
Copy link
Copy Markdown
Contributor

pyohannes commented Jul 29, 2020

@reyang Why do we have a do-not-merge label on this one?

@reyang
Copy link
Copy Markdown
Member

reyang commented Jul 29, 2020

@reyang Why do we have a do-not-merge label on this one?

Either there is a known dependency that should be merged first, or the PR is not intended to be merged (for whatever reason, although I think we would want to make it a draft), or we want the PR to wait (e.g. while doing a release).

@reyang reyang added pr:please-merge This PR is ready to be merged by a Maintainer (rebased, CI passed, has enough valid approvals, etc.) and removed pr:do-not-merge This PR is not ready to be merged. labels Jul 29, 2020
@reyang
Copy link
Copy Markdown
Member

reyang commented Jul 29, 2020

@reyang Why do we have a do-not-merge label on this one?

Either there is a known dependency that should be merged first, or the PR is not intended to be merged (for whatever reason, although I think we would want to make it a draft), or we want the PR to wait (e.g. while doing a release).

In this particular case, I was waiting for #223 to be merged first.

@reyang reyang merged commit 2d1cdea into open-telemetry:master Jul 29, 2020
@g-easy g-easy deleted the format branch July 29, 2020 07:44
ziqizh pushed a commit to ziqizh/opentelemetry-cpp that referenced this pull request Jul 31, 2020
@g-easy @ziqizh
Fix format on CI. (open-telemetry#222)
6bece60
ziqizh pushed a commit to ziqizh/opentelemetry-cpp that referenced this pull request Jul 31, 2020
@g-easy @ziqizh
Fix format on CI. (open-telemetry#222)
a92ceed
erichsueh3 pushed a commit to open-o11y/opentelemetry-cpp that referenced this pull request Aug 15, 2020
@g-easy
Fix format on CI. (open-telemetry#222)
2db30a4
GerHobbelt pushed a commit to GerHobbelt/opentelemetry-cpp that referenced this pull request Jun 17, 2025
@malkia
Merge pull request open-telemetry#222 from open-telemetry/main
e7c132c 
Add Pranav Sharma in cpp-approvers (open-telemetry#3323)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@reyang reyang reyang approved these changes

+1 more reviewer

@pyohannes pyohannes pyohannes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

pr:please-merge This PR is ready to be merged by a Maintainer (rebased, CI passed, has enough valid approvals, etc.)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@g-easy @pyohannes @reyang