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.

Sign up for GitHub

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

Jump to bottom

Merge changes from v1.35.x branch into master #25183

Merged
merged 21 commits into from
Jan 19, 2021
Merged

Merge changes from v1.35.x branch into master #25183

merged 21 commits into from
Jan 19, 2021

Commits on Jan 7, 2021

  1. Bump version to v1.35.0-pre1

    @stanley-cheung
    stanley-cheung committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    82ba4c0 View commit details
    Browse the repository at this point in the history

  2. Regenerate projects

    @stanley-cheung
    stanley-cheung committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    5564ac0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request grpc#25110 from stanley-cheung/bump-1-35-version 

    Bump version to v1.35.0-pre1
    @stanley-cheung
    stanley-cheung committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    a9bf88b View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2021

  1. update third_party/protobuf to v3.14.0

    @jtattermusch
    jtattermusch committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    8bb5593 View commit details
    Browse the repository at this point in the history

  2. regenerate proto files for csharp, php, ruby

    @jtattermusch
    jtattermusch committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    9c8818d View commit details
    Browse the repository at this point in the history

  3. run tools/distrib/python/make_grpcio_tools.py

    @jtattermusch
    jtattermusch committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    6c99a03 View commit details
    Browse the repository at this point in the history

  4. upgrade ruby, C# python and ObC to protobuf 3.14

    @jtattermusch
    jtattermusch committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    9bb2aef View commit details
    Browse the repository at this point in the history

  5. run tools/codegen/core/gen_upb_api.sh

    @jtattermusch
    jtattermusch committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    c26961b View commit details
    Browse the repository at this point in the history

  6. include a bugfix in third_party/protobuf

    @jtattermusch
    jtattermusch committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    7fc2828 View commit details
    Browse the repository at this point in the history

  7. re-run tools/distrib/python/make_grpcio_tools.py

    @jtattermusch
    jtattermusch committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    3fcf662 View commit details
    Browse the repository at this point in the history

  8. Backport "Fix implicit declaration error in zlib + macOS grpc#24979"

    @qnighy @apolcyn
    qnighy authored and apolcyn committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    58ef4d7 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2021

  1. Merge pull request grpc#25133 from apolcyn/backport_fix_zlib_implicit… 

    …_declaration

Backport "Fix implicit declaration error in zlib + macOS grpc#24979"
    @apolcyn
    apolcyn committed Jan 12, 2021
    Configuration menu
    Copy the full SHA
    96d2e95 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2021

  1. Merge pull request grpc#25142 from gnossen/cb_interop_python 

    Python Circuit Breaking Interop Test Client Additions
    @gnossen
    gnossen committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    333fb32 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. Update to server-3

    @gnossen
    gnossen committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    728f2a2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request grpc#25152 from gnossen/backport_25142 

    [Backport] Python Circuit Breaking Interop Test Client Additions
    @gnossen
    gnossen committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    4a300de View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2021

  1. include a bugfix in third_party/protobuf

    @jtattermusch
    jtattermusch committed Jan 16, 2021
    Configuration menu
    Copy the full SHA
    8d8dda4 View commit details
    Browse the repository at this point in the history

  2. re-run tools/distrib/python/make_grpcio_tools.py

    @jtattermusch
    jtattermusch committed Jan 16, 2021
    Configuration menu
    Copy the full SHA
    ded080e View commit details
    Browse the repository at this point in the history

  3. Add patch to protobuf

    @gnossen @jtattermusch
    gnossen authored and jtattermusch committed Jan 16, 2021
    Configuration menu
    Copy the full SHA
    666e603 View commit details
    Browse the repository at this point in the history

  4. Make patch work for downstream dependencies

    @gnossen @jtattermusch
    gnossen authored and jtattermusch committed Jan 16, 2021
    Configuration menu
    Copy the full SHA
    849c9b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2021

  1. Merge pull request grpc#25131 from jtattermusch/protobuf_3_14_upgrade… 

    …_for_1_35

Upgrade third_party/protobuf to v3.14.0 (for v1.35.x)
    @jtattermusch
    jtattermusch committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    5a00d68 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/v1.35.x' into HEAD

    @jtattermusch
    jtattermusch committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    60a7ce6 View commit details
    Browse the repository at this point in the history