Permalink
Commits on Sep 17, 2018
  1. Merge pull request #5127 from xfxyjwf/merge

    xfxyjwf committed Sep 17, 2018
    Merge 3.6.x branch to master
Commits on Sep 10, 2018
  1. Merge pull request #5085 from scentini/compiler-flag

    xfxyjwf committed Sep 10, 2018
    Route "compiler" value of config_setting through @bazel_tools/tools/cpp:compiler.
  2. Merge pull request #5105 from sigurdm/invoke_plugin_via_cmd

    xfxyjwf committed Sep 10, 2018
    On Windows invoke plugins using cmd.exe
  3. Merge pull request #5122 from elharo/guava20

    xfxyjwf committed Sep 10, 2018
    update to Guava 20
Commits on Sep 8, 2018
  1. Merge remote-tracking branch 'google/3.6.x'

    xfxyjwf committed Sep 8, 2018
Commits on Sep 7, 2018
  1. Merge pull request #5111 from kykrueger/master

    xfxyjwf committed Sep 7, 2018
    Update README.md with gradle instructions for java
Commits on Sep 3, 2018
  1. Merge pull request #5099 from oqton/feature/issue-5806

    xfxyjwf committed Sep 3, 2018
    Fixes JSON Loading of Any messages with Unknown Fields  in C++
Commits on Sep 1, 2018
  1. Merge pull request #5092 from xfxyjwf/contrib

    xfxyjwf committed Sep 1, 2018
    Add contributing guidelines.
Commits on Aug 29, 2018
  1. Add constributing guidelines.

    xfxyjwf committed Aug 29, 2018
  2. Merge pull request #5082 from elharo/guava

    xfxyjwf committed Aug 29, 2018
    update version
  3. Merge pull request #5079 from GobySoft/request-new-extension

    xfxyjwf committed Aug 29, 2018
    Request new option extension (and update URLs for existing projects)
  4. Merge pull request #5077 from EmersonGaziz/patch-1

    xfxyjwf committed Aug 29, 2018
    Update options.md | fix website url for C# port
Commits on Aug 23, 2018
  1. Merge pull request #5074 from xfxyjwf/links

    xfxyjwf committed Aug 23, 2018
    Revert changed links in Dockerfiles.
  2. Fix go tests.

    xfxyjwf committed Aug 23, 2018
  3. Revert changed links in Dockerfiles.

    xfxyjwf committed Aug 23, 2018
    These changes require building new docker images and without new images
    our kokoro tests are all failing.
  4. Merge pull request #5068 from xfxyjwf/links

    xfxyjwf committed Aug 23, 2018
    Replace repo links.
Commits on Aug 22, 2018
  1. Replace repo links.

    xfxyjwf committed Aug 22, 2018
Commits on Aug 20, 2018
  1. Merge pull request #5024 from greenhouse-org/fix-windows-path

    xfxyjwf committed Aug 20, 2018
    Fix TryCreateParentDirectory on Windows
  2. Merge pull request #5050 from lucidsoftware/lucid

    xfxyjwf committed Aug 20, 2018
    Change deprecated Bazel single file attr param
  3. Merge pull request #5048 from jozefizso/fix/4579_backport_for_3.6.x

    xfxyjwf committed Aug 20, 2018
    Include version information in Windows binaries (backport #4579 for 3.6.x)
Commits on Aug 14, 2018
  1. Merge pull request #5042 from dsnet/master

    xfxyjwf committed Aug 14, 2018
    Document wrapper non-uses
Commits on Aug 13, 2018
  1. Merge pull request #5033 from xfxyjwf/up

    xfxyjwf committed Aug 13, 2018
    Fix issues discovered in up-integration.
  2. Fix issues discovered in up-integration.

    xfxyjwf committed Aug 10, 2018
  3. Merge pull request #5041 from xfxyjwf/bazel

    xfxyjwf committed Aug 13, 2018
    Add status badge for bazel build.
  4. Add status badge for bazel build.

    xfxyjwf committed Aug 13, 2018
  5. Merge pull request #5040 from xfxyjwf/bazel

    xfxyjwf committed Aug 13, 2018
    Fix bazel test.
  6. Update build files.

    xfxyjwf committed Aug 13, 2018
    * Fixes #5031
    * Fixes #5037
  7. Merge pull request #5038 from xfxyjwf/proto2

    xfxyjwf committed Aug 13, 2018
    Down-integrate proto2 namespace fix.
  8. Down-integrate proto2 namespace fix.

    xfxyjwf committed Aug 13, 2018
Commits on Aug 10, 2018
  1. Fix failing tests.

    xfxyjwf committed Aug 10, 2018
    1. Fix C++ tests.
      * Add missing files to Makefile.am and fix distcheck in tests.sh
      * Remove BUILT_SOURCES from conformance/Makefile.am.
      * Add some missing override keyword.
      * Add a type cast to int64 because our StrCat() in stubs can't handle size_t.
    2. Fix Java tests.
      * Add missing test dependency on guava in pom.xml.
      * Include newly referenced test data in test resources.
      * Manually fix map_lite_test.proto which is overwritten because it's mapped
        from map_test.proto in google3.
      * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the
        opensource test passing as it's still running lite tests.
      * Add a type cast in newBuilder() because without it the code doesn't compile
        with openjdk javac 1.8 (the compiler can't figure if it's the right type
        due to complex generic typing).
    3. Fix Python tests.
      * Remove/replace references to <hash_map>.
      * Suppress more warnings in setup.py.
      * Replace incorrect header inclusion for google/protobuf/proto_api.h.
      * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's
        referenced in the updated python C extension code.
      * Replace proto2 with google::protobuf. The proto2 name is leaked to
        opensource because we removed the subsitition rule for proto2 namespace
        but only fixed C++ source code and forgot to update python C extension code.
Commits on Aug 9, 2018
  1. Merge pull request #5027 from xfxyjwf/jenkins

    xfxyjwf committed Aug 9, 2018
    Cleanup kokoro scripts.
  2. Cleanup kokoro scripts.

    xfxyjwf committed Aug 9, 2018
    Changes:
    1. Remove stuff no longer needed. Lots of the heavy lifting were there
    because we were running our own jenkins cluster and had to manage all
    the test logs ourselves. Now they are useless.
    2. Change "-j2" to "-j4" to speed up the test a little bit. Kokoro
    machines have 4 logic CPUs according to their spec.
  3. Merge pull request #5020 from brian-peloton/master

    xfxyjwf committed Aug 9, 2018
    Fix broken test of const repeated field iterators
  4. Update generated descriptors.

    xfxyjwf committed Aug 9, 2018