aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #3594 from buchgr/well-known-protosFeng Xiao2017-09-052-15/+47
|\ \ \ \ \ | |/ / / / |/| | | | bazel: Add proto_library rules for well known types. Fixes #2763
| * | | | bazel: Add proto_library rules for well known types. Fixes #2763Jakob Buchgraber2017-09-052-15/+47
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a proto_library rule for each well known type proto: $ bazel query "filter(\".*_proto$\", \"...\")" //:wrappers_proto //:timestamp_proto //:struct_proto //:field_mask_proto //:empty_proto //:duration_proto //:compiler_plugin_proto //:descriptor_proto //:api_proto //:type_proto //:source_context_proto //:any_proto Bazel users can reference these proto_library rules for their own language specific rules i.e. java_proto_library( name = "any_java_proto", deps = ["@com_google_protobuf//:any_proto"], ) Also set the workspace name to "com_google_protobuf", as proto_library rules reference protobuf that way.
* | | | Merge pull request #3560 from tenderlove/thread-safe-mapJoshua Haberman2017-08-315-23/+37
|\ \ \ \ | | | | | | | | | | Move parse frame array to the Map object
| * | | | Storing the frame on the map means we don't need the arrayAaron Patterson2017-08-303-14/+9
| | | | |
| * | | | Move parse frame array to the Map objectAaron Patterson2017-08-305-23/+42
| | | | | | | | | | | | | | | | | | | | This makes the frame stack per-parser, and per-thread. Fixes #3250
* | | | | Add php support for Timestamp. (#3575)Paul Yang2017-08-318-102/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add php support for Timestamp. * Fix comments
* | | | | Add any support in php runtime. (#3486)Paul Yang2017-08-2510-58/+904
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add any support in php runtime. * Remove unused file in config.m4 * Fix comments * Fix error for tsrmls build * Add newly added file to Makefile.am
* | | | | Merge pull request #3503 from gburgessiv/masterJisi Liu2017-08-241-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Work around a bug in clang's static analyzer
| * | | | | Work around a bug in clang's static analyzerGeorge Burgess IV2017-08-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to https://bugs.llvm.org/show_bug.cgi?id=34198, clang's static analyzer emits diagnostics about leaking `container`. Doing this assignment in two steps works around this, and shouldn't cause these issues.
* | | | | | Merge pull request #3544 from anandolee/masterJisi Liu2017-08-243-5/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add Python 3.5, 3.6 && drop Python 2.6
| * | | | | Drop python2.6Jie Luo2017-08-222-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jenkins complains for python 2.6 DEPRECATION: Python 2.6 is no longer supported by the Python core team ERROR: InvocationError: '/tmp/protobuf/protobuf/python/.tox/py26-cpp/bin/python setup.py -q build_py' https://grpc-testing.appspot.com/job/protobuf_pull_request/1502/testReport/junit/(root)/python_cpp/python_cpp/
| * | | | | Add Python 3.5 3.6Jie Luo2017-08-223-3/+12
| | | | | |
* | | | | | Merge pull request #3547 from matt-kwong/kokoro_mac_buildJisi Liu2017-08-231-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove pre-installed softwares from prebuild steps
| * | | | | | Remove pre-installed softwaresMatt Kwong2017-08-231-1/+3
| | | | | | |
* | | | | | | Merge pull request #3548 from google/3.4.xJisi Liu2017-08-228-55/+42
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Merge fixes from 3.4.x into master
| * | | | | | Merge pull request #3546 from pherl/deathtestJisi Liu2017-08-222-39/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Disable death tests on windows
| | * | | | | | Disable death tests on windowsJisi Liu2017-08-222-39/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Also remove cord related code
| * | | | | | Merge pull request #3537 from TeBoring/php-bugJisi Liu2017-08-225-1/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Use message name as defined in php runtime.
| | * | | | | | Use message name as defined in php runtime.Bo Yang2017-08-215-1/+25
| | | | | | | |
| * | | | | | | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1Jisi Liu2017-08-222-29/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup
| | * | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing unused parameter warnings under Clang.
| * | | | | | | | Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2Jisi Liu2017-08-221-2/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Merge pull request #3494 from drivehappy/clang_warning_macro
| | * | | | | | | Merge pull request #3494 from drivehappy/clang_warning_macroJisi Liu2017-08-211-2/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | Fixing -Wexpansion-to-defined Clang warning
| * | | | | | | Merge pull request #3536 from pherl/io32_11Jisi Liu2017-08-211-15/+15
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Remove C++11 features in io_win32.cc
| | * | | | | | Fix compile errorsJisi Liu2017-08-211-3/+3
| | | | | | | |
| | * | | | | | Remove C++11 features in io_win32.ccJisi Liu2017-08-211-15/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back()
* | | | | | | Merge pull request #3543 from tony612/patch-1Jisi Liu2017-08-221-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add Elixir protobuf and gRPC to 3rd party doc
| * | | | | | Add Elixir protobuf and gRPC to 3rd party docBing Han2017-08-231-0/+2
|/ / / / / /
* | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixing unused parameter warnings under Clang.
| * | | | | | Fixing unused parameter warnings under Clang.drivehappy2017-08-212-29/+33
| | | | | | |
* | | | | | | Merge pull request #3529 from pherl/merge3.4.xJisi Liu2017-08-21310-8291/+21043
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merge 3.4.x into master
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-18310-8291/+21043
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Merge pull request #3528 from pherl/rubyfixJisi Liu2017-08-181-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Bump gemspec again
| | | * | | | | Bump gemspec againJisi Liu2017-08-181-1/+1
| | | | | | | |
| | * | | | | | Merge pull request #3504 from pherl/3.4.xJisi Liu2017-08-181-0/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Prefer system distributed binaries/libraries.
| | | * | | | | Prefer system distributed binaries/libraries.Jisi Liu2017-08-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like the image has a /usr/local/bin/autoconf installed, which doesn't recognize/work with the yum installed libtools. Putting distributed binaries/libraries first solves the problem
| | * | | | | | Merge pull request #3514 from pherl/rubyfixJisi Liu2017-08-171-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump gem version for the next upload
| | | * | | | | | Bump gem version for the next uploadJisi Liu2017-08-171-1/+1
| | | | | | | | |
| | * | | | | | | Merge pull request #3502 from pherl/pypiJisi Liu2017-08-171-6/+6
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update testpypi URLs
| | | * | | | | | | clean upJisi Liu2017-08-161-3/+0
| | | | | | | | | |
| | | * | | | | | | Update testpypi addresses.Jisi Liu2017-08-161-6/+9
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The old one is deprecated and no longer working.
| | * | | | | | | Update CHANGES.txtJie Luo2017-08-161-1/+3
| | | | | | | | |
| | * | | | | | | Update CHANGES.txtJie Luo2017-08-161-1/+2
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Update php version number to 3.4.0Bo Yang2017-08-161-1/+1
| | | | | | | |
| | * | | | | | Update php c extension version number.Bo Yang2017-08-162-3/+19
| | |/ / / / /
| | * | | | | Merge pull request #3495 from pherl/c++11v3.4.0Jisi Liu2017-08-151-0/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Add std::forward and std::move autoconf check
| | | * | | | | Add std::forward and std::move autoconf checkJisi Liu2017-08-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf now uses these two features, which are not available on some platforms.
| | * | | | | | Merge pull request #3496 from pherl/mingw64Jisi Liu2017-08-152-4/+11
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Static link pthread for mingw64 protoc and enable cross compile
| | | * | | | | | Update readmeJisi Liu2017-08-151-0/+6
| | | | | | | | |
| | | * | | | | | static link for 32 bit build as well.Jisi Liu2017-08-151-1/+1
| | | | | | | | |