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

Integrate from Piper for C++, Java, and Python #8224

Merged
merged 15 commits into from Jan 28, 2021
Merged

Integrate from Piper for C++, Java, and Python #8224

merged 15 commits into from Jan 28, 2021

Commits on Jan 22, 2021

  1. Sync from Piper @353127564 

    PROTOBUF_SYNC_PIPER
    @deannagarcia
    deannagarcia committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    a001250 View commit details
    Browse the repository at this point in the history

  2. Merge tag 'refs/tags/sync-piper' into sync-stage

    @deannagarcia
    deannagarcia committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    af95001 View commit details
    Browse the repository at this point in the history

  3. Fix typo

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

  4. Add cpp_name.h to Makefile

    @deannagarcia
    deannagarcia committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    f7c212d View commit details
    Browse the repository at this point in the history

  5. Fix typo in Makefile

    @deannagarcia
    deannagarcia committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    7934a80 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. Update libprotoc.cmake

    @deannagarcia
    deannagarcia committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    9fee757 View commit details
    Browse the repository at this point in the history

  2. Change install_requires

    @deannagarcia
    deannagarcia committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    37e88c4 View commit details
    Browse the repository at this point in the history

  3. Reverse unintentional change

    @deannagarcia
    deannagarcia committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    c89cb8a View commit details
    Browse the repository at this point in the history

  4. Fix std::is_pod deprecated

    @deannagarcia
    deannagarcia committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    90327eb View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. Updating CHANGES.txt and removing all instances of std::is_pod

    @deannagarcia
    deannagarcia committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    62fb6dd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sync-stage' of https://github.com/deannagarcia/protobuf … 

    …into sync-stage
    @deannagarcia
    deannagarcia committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    2ccf400 View commit details
    Browse the repository at this point in the history

  3. Add missing bracket

    @deannagarcia
    deannagarcia committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    f1fba4c View commit details
    Browse the repository at this point in the history

  4. Remove unused variable

    @deannagarcia
    deannagarcia committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    868b712 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2021

  1. Add deleted failure lists for jruby

    @deannagarcia
    deannagarcia committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    c0f5092 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sync-stage' of https://github.com/deannagarcia/protobuf … 

    …into sync-stage
    @deannagarcia
    deannagarcia committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    75d125b View commit details
    Browse the repository at this point in the history