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

1.1.x to master again #10004

Merged
merged 7 commits into from
Mar 8, 2017
Merged

Conversation

dgquintas
Copy link
Contributor

This should be the last one prior to jumping to 1.2.x.

murgatroid99 and others added 7 commits March 2, 2017 11:32
When building the native extension make -j can absorb all available
resources on a system.  Implement "reasonable" limits on the number
of compiling jobs when the number of processors can be detected and
use a conservative count when ruby version does not provide detection.
…_nuget

Fix Grpc.HealthCheck and Grpc.Reflection packages
Add option to recompile Node library without ALPN support
Limit the gem native build resources
@googlebot
Copy link

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 by someone other than the pull request submitter. We need to confirm that they're okay 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.

Copy link
Contributor

@jtattermusch jtattermusch left a comment

Choose a reason for hiding this comment

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

LGTM for C#.

@jtattermusch
Copy link
Contributor

Marked as "release blocker" as this contains changes that also need to go to 1.2.x branch (after merging this to master)

@dgquintas
Copy link
Contributor Author

@murgatroid99 can you confirm this is ok for your contributions?

@dgquintas
Copy link
Contributor Author

@apolcyn can you confirm this is ok for your contributions?

Copy link
Contributor

@apolcyn apolcyn left a comment

Choose a reason for hiding this comment

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

LGTM for ruby change

@murgatroid99
Copy link
Member

It's OK with me

@dgquintas
Copy link
Contributor Author

Issues: #10031 #9956

@dgquintas dgquintas merged commit 18f8acf into grpc:master Mar 8, 2017
@lock lock bot locked as resolved and limited conversation to collaborators Jan 24, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants