Paul Yang
548e01324e
Merge pull request #8689 from deannagarcia/merge3.17.2
...
Merge 3.17.x into master
2021-06-03 10:39:39 -07:00
Paul Yang
bd42fcc7a3
Merge pull request #8652 from haberman/sync-stage
...
Integrate from Piper for C++, Java, and Python
2021-06-01 15:20:53 -07:00
Deanna Garcia
5b8208ecea
Update protobuf version
2021-05-25 19:36:05 +00:00
Joshua Haberman
9521803d40
Sync from Piper @375548932
...
PROTOBUF_SYNC_PIPER
2021-05-24 13:49:39 -07:00
Adam Cozzette
52784ced2f
Update protobuf version ( #8633 )
2021-05-19 16:43:44 -07:00
Deanna Garcia
380e352b0b
Sync from Piper @373820256
...
PROTOBUF_SYNC_PIPER
2021-05-14 17:50:31 +00:00
Adam Cozzette
652d99a8ee
Update protobuf version ( #8606 )
2021-05-12 16:20:18 -07:00
Adam Cozzette
f807c02226
Update protobuf version to 3.17.0-rc2 ( #8586 )
...
* Update protobuf version
* Updated Kotlin versions and updated script to handle them
2021-05-10 15:31:35 -07:00
Adam Cozzette
7025f37cde
Update protobuf version ( #8575 )
2021-05-07 09:51:15 -07:00
Joshua Haberman
f5fd897c1d
Sync from Piper @371422642
...
PROTOBUF_SYNC_PIPER
2021-04-30 16:12:50 -07:00
Joshua Haberman
ce560630bf
Sync from Piper @368734211
...
PROTOBUF_SYNC_PIPER
2021-04-15 15:53:17 -07:00
Adam Cozzette
5679811239
Merge branch '3.15.x' into merge-3-15-x
2021-04-08 10:54:02 -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
Adam Cozzette
87aa9adb86
Merge branch 'master' into 3.15.x
2021-04-02 14:55:02 -07:00
Adam Cozzette
878be3569e
Update protobuf version
2021-04-02 11:06:56 -07:00
Derek Perez
4008d229aa
Sync from Piper @366297034
...
PROTOBUF_SYNC_PIPER
2021-04-01 18:49:52 +00:00
Joshua Haberman
4a6dc34d3a
Sync from Piper @365872496
...
PROTOBUF_SYNC_PIPER
2021-03-30 12:37:31 -07:00
Joshua Haberman
96307d28f6
Sync from Piper @364389596
...
PROTOBUF_SYNC_PIPER
2021-03-22 13:05:55 -07:00
Joshua Haberman
77334e39a7
Merge tag 'refs/tags/sync-piper' into sync-stage
2021-03-22 13:05:55 -07:00
Adam Cozzette
9db84d08fb
Merge branch '3.15.x' into merge-3-15-x
2021-03-12 15:05:10 -08:00
Adam Cozzette
6aa539bf01
Update protobuf version
2021-03-10 14:53:26 -08:00
Adam Cozzette
673971834c
Merge branch 'master' into 3.15.x
2021-03-04 17:53:03 -08:00
Adam Cozzette
4fff47a418
Update protobuf version
2021-03-04 13:35:04 -08:00
Adam Cozzette
541b1735a8
Merge branch 'master' into 3.15.x-202103031418
2021-03-03 15:01:11 -08:00
Adam Cozzette
fd8aabf32d
Update protobuf version
2021-03-03 11:37:48 -08:00
Joshua Haberman
f645c7ed07
Fixed spelling errors surfaced by CodeSpell.
2021-02-26 10:54:13 -08:00
Joshua Haberman
9df42757f9
Sync from Piper @359788468
...
PROTOBUF_SYNC_PIPER
2021-02-26 10:37:37 -08:00
Adam Cozzette
983d115bd9
Update protobuf version
2021-02-25 09:20:20 -08:00
Adam Cozzette
d7e943b8d2
Update protobuf version
2021-02-23 13:21:42 -08:00
Adam Cozzette
052dc799d2
Update protobuf version
2021-02-19 15:12:24 -08:00
Adam Cozzette
ae50d9b990
Update protobuf version
2021-02-18 11:50:15 -08:00
Adam Cozzette
8260126500
Update protobuf version
2021-02-17 10:51:33 -08:00
Adam Cozzette
e9f2ef308c
Update protobuf version
2021-02-05 15:37:10 -08:00
Joshua Haberman
51daaba638
Sync from Piper @355707933
...
PROTOBUF_SYNC_PIPER
2021-02-04 14:09:49 -08:00
Deanna Garcia
a00125024e
Sync from Piper @353127564
...
PROTOBUF_SYNC_PIPER
2021-01-22 00:24:30 +00:00
Joshua Haberman
5c028d6cf4
Sync from Piper @343521567
...
PROTOBUF_SYNC_PIPER
2020-11-20 10:44:58 -08:00
Joshua Haberman
de371235c9
Sync from Piper @338284531
...
PROTOBUF_SYNC_PIPER
2020-10-21 10:04:14 -07:00
Joshua Haberman
38d6de1eef
Sync from Piper @334206209
...
PROTOBUF_SYNC_PIPER
2020-09-28 11:54:54 -07:00
Joshua Haberman
f3cf99c0fb
Sync from Piper @328224070
...
PROTOBUF_SYNC_PIPER
2020-08-24 15:48:43 -07:00
Joshua Haberman
32a94ce353
Merge tag 'refs/tags/sync-piper' into sync-stage
...
# Conflicts:
# csharp/src/Google.Protobuf.Test/testprotos.pb
2020-08-17 15:26:33 -07:00
Joshua Haberman
95e6c5b474
Sync from Piper @327110949
...
PROTOBUF_SYNC_PIPER
2020-08-17 15:26:13 -07:00
Adam Cozzette
58f4260e8e
Merged 3.13.x into master
2020-08-17 11:06:11 -07:00
Adam Cozzette
fde7cf7358
Update protobuf version
2020-08-14 15:20:53 -07:00
Adam Cozzette
98c2e69f8c
Update protobuf version
2020-08-12 14:49:20 -07:00
Peter Newman
e2cc2de304
Fix lots of spelling errors ( #7751 )
...
* Fix a typo
* Fix lots of spelling errors
* Fix a few more spelling mistakes
* s/parsable/parseable/
* Don't touch the third party files
* Cloneable is the preferred C# term
* Copyable is the preferred C++ term
* Revert "s/parsable/parseable/"
This reverts commit 534ecf7675
2020-08-10 11:08:25 -07:00
Adam Cozzette
1c587a8059
Updated version to 3.13.0-rc2
2020-08-07 14:44:49 -07:00
Adam Cozzette
6b3a834f33
Temporarily disabled ExtensionRegistryFactoryTest
...
This test has started failing, and I believe the cause is a change in
class loading behavior in Java 11. As far as I know, that breaks the
test logic but there is nothing wrong with the non-test code. This
change temporarily disables the test so that we can unblock the 4.0
release while I work on a more permanent fix.
2020-08-07 14:44:49 -07:00
Adam Cozzette
8940150706
Updated version to 3.13.0-rc1.
2020-08-07 14:44:49 -07:00
Joshua Haberman
f77065d4eb
Sync from Piper @316511779
...
PROTOBUF_SYNC_PIPER
2020-06-15 11:48:47 -07:00
Joshua Haberman
b971243fe0
Merge branch '3.12.x' into merge-release-branch
2020-06-02 13:24:30 -07:00
