Skip to content

Upmerge v1.17.x to master#17423

Merged
jtattermusch merged 38 commits intogrpc:masterfrom
jtattermusch:upmerge_v1_17_x_to_master
Dec 6, 2018
Merged

Upmerge v1.17.x to master#17423
jtattermusch merged 38 commits intogrpc:masterfrom
jtattermusch:upmerge_v1_17_x_to_master

Conversation

@jtattermusch
Copy link
Copy Markdown
Contributor

@jtattermusch jtattermusch commented Dec 6, 2018

There's already quite a few changes, so let's doublecheck the diff.

kkm and others added 30 commits October 14, 2018 02:24
Redo C# examples to use new Grpc.Tools
6fcb5b2 
* No pre-compilation of proto files required;
* Tested under Windows and Linux dotnet and mono;
* But not tested on Mac/mono;
* README updated.
Bump version to v1.17.0-pre1
56f6772
Generate projects
da14743
dev->pre1 for core version
96ed4b7
Generate projects
4f41886
@muxi
Merge pull request grpc#17246 from muxi/v1.17.x
53cfea5 
Bump v1.17.x version to v1.17.0-pre1
@stanley-cheung
Wrap pthread_atwork call
9809e01
@stanley-cheung
Merge pull request grpc#17262 from stanley-cheung/php-windows-fix
c46d9f8 
Wrap pthread_atfork call
@stanley-cheung
Bump to v1.17.0-pre2
894b313
@stanley-cheung
Re-generate projects
42e3ae7
@stanley-cheung
Merge pull request grpc#17263 from stanley-cheung/bump-to-1-17-pre2
802d89f 
Bump to v1.17.0-pre2
@jtattermusch
avoid c-ares dependency on libnsl
64c5f31
Use 'preX' when pre-releasing gRPC-C++.podspec
96a0db9
@muxi
Merge pull request grpc#17277 from muxi/grpc-cpp-pod-version
a4be444 
Use 'preX' version number when pre-releasing gRPC-C++.podspec
@jtattermusch
Merge pull request grpc#17271 from jtattermusch/csharp_avoid_nsl_1_17x
81c2243 
avoid c-ares dependency on libnsl (for v1.17.x)
@stanley-cheung
Fix PHP ZTS build breakage
90cdbd6
@stanley-cheung
Merge pull request grpc#17314 from stanley-cheung/php-fix-zts
3337a34 
Fix PHP ZTS build breakage
@stanley-cheung
Bump to v1.17.0-pre3
019feec
@stanley-cheung
Regenerate projects
698cf22
@muxi
Merge pull request grpc#17319 from stanley-cheung/bump-to-pre3
ff85fca 
Bump to v1.17.0-pre3
@stanley-cheung
PHP: fix ZTS build
460bc6f
@stanley-cheung
Merge pull request grpc#17325 from stanley-cheung/php-fix-zts
a4c9b80 
PHP: fix ZTS build
Add explicit ItemGroups to .csproj
a82070d
@jtattermusch
basic tcp_trace support for windows
5861f08
@jtattermusch
better slice management for win_read
b0139e1
Bump version to v1.17.0
97ec5c1
@apolcyn
Cancel still-active c-ares queries after 10 seconds to avoid chance o…
570599c 
…f deadlock
@muxi
Merge pull request grpc#17381 from muxi/v1.17.x
d6c9899 
Bump version to v1.17.0
@apolcyn
Merge pull request grpc#17382 from apolcyn/backport_17354
0889573 
Cancel still-active c-ares queries after a timeout, for 1.17.x
@markdroth
Change xds plugin name to xds_experimental until it's ready for use.
0cf8c59
jtattermusch and others added 8 commits December 5, 2018 17:22
@jtattermusch
fix macos PR jobs on high-sierra workers
d685afc
@jtattermusch
Merge pull request grpc#17406 from jtattermusch/fix_pr_high_sierra_v1…
25eb200 
…_17_x

fix macos PR jobs on high-sierra workers (for v1.17.x)
@jtattermusch
Merge pull request grpc#17378 from jtattermusch/windows_oom_fix_v1_17
c9b1662 
Better slice management for windows reads (for v1.17.x)
@markdroth
Merge pull request grpc#17405 from markdroth/xds_experimental_v1.17.x
738dd38 
Change xds plugin name to xds_experimental until it's ready for use.
@ericgribkoff
Revert "Strip manylinux1 binary wheels"
5710a3a 
This reverts commit be4b2db.

Appears to leave the incorrect hash in the wheel RECORD file, as in
grpc#17409
@ericgribkoff
Merge pull request grpc#17415 from ericgribkoff/cython_strip_backport
d5d6e21 
Revert "Strip manylinux1 binary wheels"
@jtattermusch
Merge pull request grpc#14684 from kkm000/package-grpc-tools-examples
8955557 
Redo C# examples to use new Grpc.Tools
@jtattermusch
Merge remote-tracking branch 'upstream/v1.17.x' into HEAD
be7141f
@grpc-testing
Copy link
Copy Markdown

grpc-testing commented Dec 6, 2018 

****************************************************************

libgrpc.so

     VM SIZE        FILE SIZE
 ++++++++++++++  ++++++++++++++

  [ = ]       0        0  [ = ]


****************************************************************

libgrpc++.so

     VM SIZE        FILE SIZE
 ++++++++++++++  ++++++++++++++

  [ = ]       0        0  [ = ]

@grpc-testing
Copy link
Copy Markdown

grpc-testing commented Dec 6, 2018 

[trickle] No significant performance differences

@grpc-testing
Copy link
Copy Markdown

grpc-testing commented Dec 6, 2018 

Objective-C binary sizes
*****************STATIC******************
  New size                      Old size
 2,019,735      Total (=)      2,019,735

 No significant differences in binary sizes

***************FRAMEWORKS****************
  New size                      Old size
11,154,115      Total (<)     11,154,121

 No significant differences in binary sizes

@grpc-testing
Copy link
Copy Markdown

grpc-testing commented Dec 6, 2018 

Corrupt JSON data (indicates timeout or crash): 
    bm_call_create.BM_IsolatedFilter_ClientChannelFilter_NoOp_.counters.new: 10
    bm_call_create.BM_IsolatedFilter_ClientChannelFilter_NoOp_.counters.old: 10


[microbenchmarks] No significant performance differences

@jtattermusch jtattermusch added release notes: no Indicates if PR should not be in release notes lang/all wrapped languages labels Dec 6, 2018
@jtattermusch
Copy link
Copy Markdown
Contributor Author

jtattermusch commented Dec 6, 2018

I'll be on vacation over the next few days, so feel free to merge once we have all the approvals.

muxi
muxi approved these changes Dec 6, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@muxi muxi left a comment

Choose a reason for hiding this comment

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

LGTM

@jtattermusch
Copy link
Copy Markdown
Contributor Author

jtattermusch commented Dec 6, 2018

Known failures:
#17375

@jtattermusch jtattermusch merged commit 1edcb2f into grpc:master Dec 6, 2018
This was referenced Dec 6, 2018
Closed
Closed
@lock lock bot locked as resolved and limited conversation to collaborators Mar 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@apolcyn apolcyn Awaiting requested review from apolcyn

3 more reviewers

@muxi muxi muxi approved these changes

@ericgribkoff ericgribkoff ericgribkoff approved these changes

@nicolasnoble nicolasnoble nicolasnoble approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@muxi muxi

@ericgribkoff ericgribkoff

@stanley-cheung stanley-cheung

Labels

lang/all wrapped languages release notes: no Indicates if PR should not be in release notes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@jtattermusch @grpc-testing @muxi @ericgribkoff @nicolasnoble @stanley-cheung @apolcyn @markdroth