AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
7,459 Commits 35 Branches 138 Tags 124 MiB
c855561c54
Commit Graph

226 Commits

Author SHA1 Message Date
Joshua Haberman
183cdec7cd Sync from Piper @314226556 
PROTOBUF_SYNC_PIPER
 2020-06-01 16:32:31 -07:00
Joshua Haberman
c077d949d8 Merge branch '3.12.x' into merge-312 2020-05-26 16:45:43 -07:00
Joshua Haberman
beeb621f50
Update protobuf version (#7557) 2020-05-26 15:46:39 -07:00
Joshua Haberman
0a737d8eb0 Sync from Piper @313142438 
PROTOBUF_SYNC_PIPER
 2020-05-26 00:26:15 -07:00
Joshua Haberman
6ad138d85a
Update protobuf version (#7535) 2020-05-20 10:54:29 -07:00
Joshua Haberman
9952e36f92
Merge release branch into master. (#7517) 
* Added background information about proto3 presence. (#7501)

* Fixed bug in map key sorting for Java TextFormat. (#7508)

Fixes: https://github.com/protocolbuffers/protobuf/issues/7505

* Update protobuf version

* Added a changelog entry about the Java fix. (#7516)
 2020-05-16 16:42:02 -07:00
Joshua Haberman
e90b71cdee Update protobuf version 2020-05-15 13:28:07 -07:00
Protobuf Team
63da77bc97 Project import generated by Copybara 
PiperOrigin-RevId: 311748964
 2020-05-15 09:55:02 -07:00
Joshua Haberman
62ab8333c9 Merge branch '3.12.x' into merge-312-branch 2020-05-12 16:59:55 -07:00
Joshua Haberman
f597a24627 Update protobuf version 2020-05-12 12:49:46 -07:00
Joshua Haberman
6b5fb807c0 Sync from Piper @310858019 
PROTOBUF_SYNC_PIPER
 2020-05-11 00:12:20 -07:00
Daniel Kurka
bb3460d71b Project import generated by Copybara 
PiperOrigin-RevId: 310614231
 2020-05-08 13:06:41 -07:00
Daniel Kurka
ed596ef68d Project import generated by Copybara 
PiperOrigin-RevId: 310497816
 2020-05-07 21:53:47 -07:00
Joshua Haberman
a9f11d7d64
Updated version to 3.12.0-rc1. (#7449) 2020-04-30 15:34:10 -07:00
Joshua Haberman
c649397029
Set execute bit on files if and only if they begin with (#!). (#7347) 
* Set execute bit on files if and only if they begin with (#!).

Git only tracks the 'x' (executable) bit on each file. Prior to this
CL, our files were a random mix of executable and non-executable.
This change imposes some order by making files executable if and only
if they have shebang (#!) lines at the beginning.

We don't have any executable binaries checked into the repo, so
we shouldn't need to worry about that case.

* Added fix_permissions.sh script to set +x iff a file begins with (#!).
 2020-04-01 15:28:25 -07:00
Joshua Haberman
b99994d994 Sync from Piper @304070343 
PROTOBUF_SYNC_PIPER
 2020-03-31 16:25:37 -07:00
Rafi Kamal
da1c46401b Project import generated by Copybara 
PiperOrigin-RevId: 301311140
 2020-03-16 23:09:45 -07:00
Rafi Kamal
422053f3bc Project import generated by Copybara 
PiperOrigin-RevId: 300708221
 2020-03-13 00:58:26 -07:00
Protobuf Team
94b39efdf7 Project import generated by Copybara 
PiperOrigin-RevId: 300369497
 2020-03-11 11:31:16 -07:00
Rafi Kamal
637d7eda30 Project import generated by Copybara 
PiperOrigin-RevId: 300117791
 2020-03-10 10:08:50 -07:00
Rafi Kamal
4fa3c8e883 Project import generated by Copybara 
PiperOrigin-RevId: 299970447
 2020-03-09 17:00:42 -07:00
Rafi Kamal
64f151fa2b Project import generated by Copybara 
PiperOrigin-RevId: 298409332
 2020-03-02 11:59:44 -08:00
Daniel Kurka
ed19442270 Project import generated by Copybara 
PiperOrigin-RevId: 297743020
 2020-02-27 18:55:33 -08:00
Rafi Kamal
9bbc664671 Project import generated by Copybara 
PiperOrigin-RevId: 297709554
 2020-02-27 15:55:57 -08:00
Protobuf Team
d2727a2ce3 Project import generated by Copybara 
PiperOrigin-RevId: 297637283
 2020-02-27 10:55:04 -08:00
Artem Kustikov
743a4322ba
Fix js message pivot selection (#6813) 
* fix javascript setFieldIgnoringDefault_ logic

* remove package-lock.json

* fix build script to include new UT asset file

Co-authored-by: Daniel Kurka <kurka.daniel@gmail.com>
 2020-02-27 09:10:16 -08:00
Rafi Kamal
0eb476b696 Merge branch 3.11.x to master 2020-02-18 16:42:47 -08:00
rafikamal
83b47e4c65 Project import generated by Copybara 
PiperOrigin-RevId: 294283216
 2020-02-13 15:48:49 -08:00
rafikamal
becf5afd34 Project import generated by Copybara 
PiperOrigin-RevId: 293911829
 2020-02-13 15:48:41 -08:00
rafikamal
46b0fd9cec Project import generated by Copybara 
PiperOrigin-RevId: 293893031
 2020-02-13 15:48:34 -08:00
Rafi Kamal
c74057267d
Update protobuf version (#7206) 2020-02-12 14:41:16 -08:00
Protobuf Team
cc938ea39a Project import generated by Copybara. 
PiperOrigin-RevId: 293139128
 2020-02-05 17:09:37 -08:00
Rafi Kamal
345df38dd3
Update protobuf version (#7143) 2020-01-31 13:47:09 -08:00
Rafi Kamal
ed8688de72
Merge pull request #7064 from rafi-kamal/3.11.x-202001071136 
Merge branch 3.11.x to master
 2020-01-08 12:24:20 -08:00
Brian Wignall
a104dffcb6 Fix typos (#7050) 
Uses https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines to find likely typos, with https://github.com/bwignall/typochecker to help automate the checking.
 2020-01-08 10:18:20 -08:00
Rafi Kamal
39492b68d8
Update protobuf version to 3.11.2 (#7004) 2019-12-10 17:50:28 -08:00
Rafi Kamal
b78c53f935
Update protobuf version to 3.11.1 (#6972) 2019-12-02 11:57:21 -08:00
Rafi Kamal
1d5375c621
Update protobuf version to 3.11.0 (#6943) 2019-11-25 15:12:00 -08:00
Rafi Kamal
6220db4ec4
Update protobuf version (#6927) 2019-11-21 19:10:04 -08:00
Rafi Kamal
cd7b27be38 Update protobuf version (#6898) 2019-11-19 15:32:13 -08:00
Rafi Kamal
3cc55d6167
Update protobuf version (#6898) 2019-11-15 17:44:10 -08:00
Rafi Kamal
4e93585e8b
Down integrate to GitHub (#6893) 2019-11-15 10:40:11 -08:00
Rafi Kamal
58d4420e2d Down Integrate Internal Changes 2019-11-12 13:38:58 -08:00
Rafi Kamal
2ed41359fe Update version to 3.11.0-RC0 2019-10-03 14:24:27 -07:00
Rafi Kamal
97c7c3fc97 Merge 3.10.x to master 2019-10-03 14:03:38 -07:00
Jie Luo
2a4657971d
Update to 3.10.0-rc0 (#6660) 
* Cherry pick changes on update_version.py #6643

* Update version to 3.10.0-rc-0

* Do not add rc0 to php packages.xml
 2019-09-18 13:30:03 -07:00
Rafi Kamal
5021cd3419 Update protobuf version 2019-09-12 13:50:24 -07:00
Paul Yang
763c358874
Down Integrate Internal Changes (#6634) 
* Down integrate to GitHub

* Remove unintentional double assign

* Change ByteCountInt64 to int64_t

* Revert changes in binary_conformance_test.cc

* Revert unnecessary changes
 2019-09-12 11:03:27 -07:00
Rafi Kamal
56bf637221 Update protobuf version 2019-09-05 09:47:52 -07:00
Rafi Kamal
4f02f056b5 Down integrate to GitHub 2019-08-22 17:33:01 -07:00