Skip to content

Conversation

gnossen
Copy link
Contributor

@gnossen gnossen commented Dec 3, 2019

The diff is empty, but still performing the upmerge for record-keeping purposes.

yashykt and others added 26 commits October 23, 2019 18:35
After closing a file descriptor honor the "closed" flag to avoid
re-closing it in post-fork processing.

File descriptors must be closed during an orphan operation, because
the closing of the file-descriptor is necessary for the correct function
of code that is polling on the descriptor.  Thus even if there are active
references, the close() call is necessary.  But this means that post-fork
code may close the file-descriptor, since it is only unregistered from
post-fork after the ref-count reaches 0.  All of this can be handled by
ensuring that the post-fork code honors the "close" flag.
Port grpc#20767: Add Objective-C Doxygen Documentation
Backport grpc#20452 to fix the forking issue on macOS
…-dockerfiles

PHP: backport dockerfile fixes
Port grpc#20977: gRPC-C++ podspec follows gRPC versioning
Backport grpc#21165: Fix typo in gRPC C++ podspec
@gnossen gnossen added lang/all wrapped languages release notes: no Indicates if PR should not be in release notes labels Dec 3, 2019
@gnossen gnossen requested a review from srini100 December 3, 2019 02:08
@gnossen
Copy link
Contributor Author

gnossen commented Dec 3, 2019

Infastructure flake: #21320

@gnossen gnossen merged commit 9940819 into grpc:master Dec 3, 2019
@gnossen gnossen deleted the upmerge_1_25 branch December 3, 2019 18:53
@lock lock bot locked as resolved and limited conversation to collaborators Mar 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lang/all wrapped languages release notes: no Indicates if PR should not be in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants