Commit Graph

8375 Commits

Author SHA1 Message Date
Dor
ee04809540
Use a newer version of rules_proto, with the new rule proto_descriptor_set (#8469) 2021-04-09 11:12:25 -07:00
Adam Cozzette
017599b450
Merge pull request #8470 from acozzette/merge-3-15-x
Merge 3.15.x into master
2021-04-08 13:24:32 -07:00
Adam Cozzette
5679811239 Merge branch '3.15.x' into merge-3-15-x 2021-04-08 10:54:02 -07:00
Matt Fowles Kulukundis
049e05f052
Merge pull request #8467 from SR-Lut3t1um/patch-1
[documentation] [java] Fixed version for gradle in java Readme.md
2021-04-08 09:26:57 -04:00
Tobias Liese
1db2b662de
Fixed version for gradle in java Readme.md
Looks like this was forgotten by the last time this was edited.
2021-04-08 10:48:22 +02:00
Adam Cozzette
e8b78f8208
Fixed memory leak of Ruby arena objects. (#8465)
In our free() method, we were freeing the memory from the
upb arena but we were failing to free the memory for the
Ruby arena object. This was causing every Ruby arena object
to leak: even though the objects were getting GC'd, the
underlying memory was not getting released.

Co-authored-by: Joshua Haberman <jhaberman@gmail.com>
2021-04-07 16:46:18 -07:00
Adam Cozzette
436bd7880e
Updated version to 3.15.8 (#8463)
* Update protobuf version

* Updated CHANGES.txt and package.xml for 3.15.8
2021-04-07 15:38:38 -07:00
Matt Fowles Kulukundis
c2148566c7
Merge pull request #8327 from alkasm/alkasm/method-desc-copy-to-proto
[python-runtime] Add MethodDescriptor.CopyToProto()
2021-04-07 16:02:22 -04:00
Joshua Haberman
1ed9a8b521
Merge pull request #8461 from haberman/ruby-arena-memory-leak
Fixed memory leak of Ruby arena objects.
2021-04-07 11:25:42 -07:00
Joshua Haberman
67fee915e0 Fixed memory leak of Ruby arena objects.
In our free() method, we were freeing the memory from the
upb arena but we were failing to free the memory for the
Ruby arena object. This was causing every Ruby arena object
to leak: even though the objects were getting GC'd, the
underlying memory was not getting released.
2021-04-07 10:30:51 -07:00
Alexander Reynolds
3c782fc3d6 Remove py impl skip for method desc CopyToProto test 2021-04-07 02:21:46 -07:00
Adam Cozzette
7689f00ba8
Update protobuf version (#8448) 2021-04-06 14:26:56 -07:00
Adam Cozzette
6099c6505d
Updated CHANGES.txt for 3.16.0 (#8456)
* Updated CHANGES.txt for 3.16.0

* Fix spelling errors
2021-04-06 13:23:26 -07:00
deannagarcia
e844a53716
Merge branch 'master' into kotlinProtos 2021-04-06 10:18:13 -07:00
Chris Rebert
9d175493a3 addressbook.proto: Enable java_multiple_files option
And update the java_package value accordingly.
Enabling java_multiple_files is preferred nowadays.
Refs CL 348101638 which updates the tutorial accordingly.
2021-04-06 10:07:52 -07:00
Jan Tattermusch
053966b495
Emulated python aarch64 tests (#8392)
This runs basic python aarch64 tests under qemu emulator, but uses artifacts that can be cross-built by a host compiler.
2021-04-05 14:12:54 -07:00
Lukas Fittl
93c703e816 Add test for json_name functionality 2021-04-03 18:42:54 -07:00
Lukas Fittl
07f263c7ef Address review feedback 2021-04-03 18:42:43 -07:00
Adam Cozzette
c9343864a2
Merge pull request #8447 from acozzette/merge-3-15-x
Merge 3.15.x into the master branch
2021-04-02 15:51:34 -07:00
Adam Cozzette
600799912a Revert "[C++] Refactor uint128 (#8416)"
This reverts commit b604419d26.
2021-04-02 15:49:06 -07:00
Adam Cozzette
87aa9adb86 Merge branch 'master' into 3.15.x 2021-04-02 14:55:02 -07:00
Deanna Garcia
50592a51ab Making dependency on java proto instead of copying files and generating kotlin generated code for standard protos 2021-04-02 21:45:41 +00:00
Derek Perez
97cb3a862f
Merge pull request #8444 from perezd/sync-stage
Integrate from Piper for C++, Java, and Python
2021-04-02 11:22:40 -07:00
Adam Cozzette
878be3569e Update protobuf version 2021-04-02 11:06:56 -07:00
Adam Cozzette
c00c2d43bb Updated CHANGES.txt and package.xml with changes for 3.15.7 2021-04-02 11:06:56 -07:00
Deanna Garcia
7c3b28df7b Trying optin in codespell 2021-04-01 21:20:46 +00:00
Derek Perez
361308c4f2 fix wrapping of line in CHANGES.txt 2021-04-01 21:15:38 +00:00
Deanna Garcia
610fc635a8 Adding opt to codespell instead of OptIn 2021-04-01 21:05:51 +00:00
Deanna Garcia
7b23ae1e66 Merge remote-tracking branch 'remotes/upstream/master' into kotlinProtos 2021-04-01 21:02:18 +00:00
Derek Perez
9147109854 editing CHANGES.txt 2021-04-01 20:49:42 +00:00
David L. Jones
f82e268ed7 Remove references to stale benchmark data sources. 2021-04-01 12:21:02 -07:00
David L. Jones
240e54efe5 Remove references to stale benchmark data sources. 2021-04-01 12:19:10 -07:00
Joshua Haberman
f3f8707ba5
Merge pull request #8434 from haberman/ruby-message-eq
Fixed message equality in cases where the message type is different.
2021-04-01 12:16:53 -07:00
Derek Perez
49ed194e88 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-01 18:49:53 +00:00
Derek Perez
4008d229aa Sync from Piper @366297034
PROTOBUF_SYNC_PIPER
2021-04-01 18:49:52 +00:00
Joshua Haberman
38e1b59258 Elided the TYPE() and msgdef checks by using CLASS_OF. 2021-04-01 10:22:35 -07:00
deannagarcia
c3f4b108b3
Changing codespell and mergeable ymls to prepare for opensourcing kotlin protos (#8442) 2021-04-01 09:46:58 -07:00
Deanna Garcia
4a82094b61 Reversing codespell changes 2021-03-31 20:48:33 +00:00
cfredri4
c47ebfd82b
Fix maven URL (#8440) 2021-03-31 13:47:47 -07:00
Deanna Garcia
043935b672 Fixing codespell allow list 2021-03-31 19:58:30 +00:00
Deanna Garcia
a0887367e1 Adding OptIn to the allow list for spell check 2021-03-31 19:54:12 +00:00
Deanna Garcia
74a32c02a1 fixing kokoro tests 2021-03-31 18:22:37 +00:00
aaron ai
62c402ae37
Add 'java/lite/target' to .gitignore (#8439) 2021-03-31 11:03:01 -07:00
Deanna Garcia
9aaaf70154 updating makefile 2021-03-31 17:23:02 +00:00
Deanna Garcia
b0acba39c9 cleaning up 2021-03-31 16:54:01 +00:00
Joshua Haberman
e9360dfa53
Merge pull request #8437 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-03-30 13:41:33 -07:00
Deanna Garcia
30355ff78a Fixing build 2021-03-30 20:01:56 +00:00
Joshua Haberman
7224406161 Updated CHANGES.txt for sync. 2021-03-30 12:38:52 -07:00
Joshua Haberman
c0c6cad184 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	src/google/protobuf/stubs/statusor.h
2021-03-30 12:37:32 -07:00
Joshua Haberman
4a6dc34d3a Sync from Piper @365872496
PROTOBUF_SYNC_PIPER
2021-03-30 12:37:31 -07:00