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

Fix windows logging ut #331

Merged
merged 3 commits into from
Jun 29, 2018
Merged

Conversation

NeroBurner
Copy link
Contributor

this is the commits from PR #93 from @artemdinaburg rebased on the current master. @artemdinaburg already signed the CLA, hope this is ok

these changes fixes the logging unittest on Windows (MSVC and MinGW)

Using CI from #330
Appveyor: https://ci.appveyor.com/project/NeroBurner/glog/build/1.0.100
Travis: https://travis-ci.org/NeroBurner/glog/builds/394146261

@googlebot
Copy link
Collaborator

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@NeroBurner
Copy link
Contributor Author

removed the CI commit, that was not intendet to be in there

@sergiud could you review the commits. In the original PR #93 you said the commits should be squashed. Shall I squash them instead?

@sergiud sergiud self-assigned this Jun 21, 2018
@sergiud
Copy link
Collaborator

sergiud commented Jun 21, 2018

That's okay. I can squash the commits myself.

@NeroBurner
Copy link
Contributor Author

I think this PR was unintentionally closed by merging the commit from #332

@sergiud sergiud reopened this Jun 22, 2018
@sergiud sergiud merged commit 3267f3e into google:master Jun 29, 2018
This was referenced Jul 2, 2018
@NeroBurner NeroBurner deleted the fix_windows_logging_ut branch July 2, 2018 11:10
@jakirkham
Copy link

Would it be possible possible to get a release with this change?

durswd pushed a commit to durswd/glog that referenced this pull request Sep 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants