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

3703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Haberman
431ba4b37d Merge pull request #1549 from xyzzyz/arena_export 
Export class Arena to shared library.
 2016-05-18 13:14:55 -07:00
Joshua Haberman
ba696e7bed Merge pull request #1547 from xyzzyz/js_generator 
Fix #include in js_generator.cc
 2016-05-18 13:14:19 -07:00
Jisi Liu
cbb9183e89 Merge pull request #1559 from google/beta-3 
Merge beta-3 release branch again.
 2016-05-18 11:44:56 -07:00
Josh Haberman
545527e8cf Ruby oneofs: return default instead of nil for unset fields. 2016-05-18 10:58:02 -07:00
Paul Yang
32e3d7a109 Merge pull request #1412 from google/internal 
Integrate interanl changes
 2016-05-18 20:36:35 +08:00
Bo Yang
6673283a56 Integrate interanl changes 2016-05-18 17:11:22 +08:00
Joshua Haberman
718eb75b51 Merge pull request #1548 from anandolee/master 
JSON format for Any message must print @type first
 2016-05-17 17:24:15 -07:00
Jisi Liu
97aa8a0784 Merge pull request #1551 from pherl/beta-3 
Fix protoc artifact pom version
 2016-05-17 17:20:51 -07:00
Jisi Liu
fe06eb62c6 Fix protoc artifact pom version 2016-05-17 17:01:10 -07:00
Jie Luo
b01b1a8ebe JSON format for Any message must print @type first, use OrderedDict instead of {} 2016-05-17 15:14:53 -07:00
Feng Xiao
4f630a6857 Add compatiblity tests against v2.5.0 2016-05-17 15:13:59 -07:00
Adam Michalik
810ba9b8f2 Export class Arena to shared library. 
This got broken in commit 6ef984af4b
which integrated changes from internal branch.
 2016-05-17 14:39:48 -07:00
Adam Michalik
f2885f619a Fix #include in js_generator.cc 
The commit 3b3c8abb96 has replaced the <>
with "" in #include statement in js_generator.cc
 2016-05-17 12:43:32 -07:00
Jisi Liu
67d2d45d73 Merge pull request #1546 from pherl/beta-3 
Added download_url to be able to upload to pypi.
 2016-05-17 10:59:07 -07:00
Jisi Liu
b3bb46c51b Added download_url to be able to upload to pypi. 2016-05-17 10:50:43 -07:00
Jisi Liu
c8be6ee00c Merge pull request #1542 from google/beta-3 
Merge Beta 3 release branch into master
 2016-05-16 13:46:16 -07:00
Jisi Liu
3470b6895a Merge pull request #1540 from pherl/changelog 
Update changes for lite
 2016-05-16 11:34:04 -07:00
Jisi Liu
cf1fd7ed65 Merge pull request #1533 from pherl/mapcomment 
Remove the comments about iterator validation
 2016-05-16 11:33:46 -07:00
Jisi Liu
0ec34bfbc1 Update changes for lite 2016-05-16 11:20:33 -07:00
Jisi Liu
5e7c4cb3f6 Remove the comments about iterator validation 
As it may be implementation dependent.
 2016-05-13 18:12:57 -07:00
Jisi Liu
f2db1e0e39 Merge pull request #1532 from pherl/changelog 
Update changelogs for C++ maps
 2016-05-13 17:47:10 -07:00
Jisi Liu
034867f762 Update changelogs for C++ maps 2016-05-13 16:16:14 -07:00
Joshua Haberman
dc4970684a Merge pull request #1529 from gkraynov/test-redundant-varint 
Test redundant varint fields decoding in JS.
 2016-05-13 14:50:46 -07:00
Jisi Liu
5c29835f67 Merge pull request #1528 from pherl/master 
Remove the instructions for pbconfig.h
 2016-05-13 11:27:24 -07:00
Jisi Liu
b126706cf0 Merge pull request #1527 from haberman/changelog 
Added release notes for Ruby and JavaScript.
 2016-05-12 17:57:29 -07:00
Josh Haberman
d346f4998d Added release notes for Ruby and JavaScript. 2016-05-12 17:55:56 -07:00
Jisi Liu
ce7e502e4b Remove the instructions for pbconfig.h 2016-05-12 17:55:29 -07:00
Jisi Liu
7b87f77a25 Merge pull request #1521 from zhangkun83/master 
Fine-tune build scripts and better documentation.
 2016-05-12 17:50:13 -07:00
Kun Zhang
04757db7a8 Fix the server id in example 2016-05-12 16:39:49 -07:00
Jisi Liu
9f84114864 Merge pull request #1520 from pherl/hashmapvs2008 
Bridge vs2008 hashmaps.
 2016-05-12 10:34:40 -07:00
Jisi Liu
325cc42e98 Merge pull request #1522 from xfxyjwf/compatibility_notice 
Add compatibility notice for Java.
 2016-05-12 10:32:48 -07:00
Jisi Liu
f9fd4509f6 Merge pull request #1524 from anandolee/master 
python changes
 2016-05-12 10:29:32 -07:00
Grigoriy Kraynov
5d54a852eb Test redundant varint fields decoding in JS. 
Varints are generally encoded in minimum possible length but need to
ensure that any redundancy does not break fields decoder.
 2016-05-12 14:22:12 +01:00
Jon Skeet
371d341c7e Merge pull request #1518 from jskeet/move_test 
Move test for standalone BoolValue to JsonParserTest
 2016-05-12 10:04:38 +01:00
Jie Luo
e4ca694cdf python changes 2016-05-11 16:39:50 -07:00
Feng Xiao
09732c96ac Add compatibility notice for Java. 2016-05-11 16:22:30 -07:00
Kun Zhang
28cb77f39e Fine-tune build scripts and better documentation. 
"make google/protobuf/stubs/pbconfig.h" was added in hope of addressing
the issue that when you "make protoc" from a freshly checked out
project, pbconfig.h will be reported missing. However, the trick doesn't
seem to work. Instead, add instructions in the document to work the issue
around.

Also document why MSYS2 cannot be used for publishing protoc.
 2016-05-11 16:18:26 -07:00
Jie Luo
e1f588ae3c Merge pull request #1 from google/beta-3 
Beta 3
 2016-05-11 16:07:43 -07:00
Jisi Liu
71dd9c4a5e Merge pull request #1515 from pherl/changelog-beta3 
Initial draft for changelog.
 2016-05-11 15:32:19 -07:00
Jisi Liu
ede9cc4bd5 Update comments for csharp, zero-copy and objc. 2016-05-11 15:30:21 -07:00
Jisi Liu
19472bf5cb Merge pull request #1512 from pherl/beta-3 
Update version numbers for beta3
 2016-05-11 15:10:24 -07:00
Jisi Liu
017d390d65 Fix csharp version 2016-05-11 15:09:43 -07:00
Jisi Liu
dbdf6d9085 Bridge vs2008 hashmaps. 2016-05-11 14:59:55 -07:00
Jisi Liu
5668e2e426 Fix typo. 2016-05-11 14:57:06 -07:00
Feng Xiao
920ee735cf Merge pull request #1483 from wal-rus/fix-boost-incompatibility 
Fix C++ Boost incompatibility on Windows/MSVC
 2016-05-11 10:30:41 -07:00
Jon Skeet
7cc9cb407b Move test for standalone BoolValue to JsonParserTest 
Also added a standalone formatter test, for confidence.
Have validated that undoing the change in 835fb947 breaks the tests
(i.e. we are still testing that the change is required).
 2016-05-11 18:07:03 +01:00
Jon Skeet
cca2d44ef1 Merge pull request #1517 from jhickson/boolvalue 
Fix C# Json parsing of well-known type Boolvalue
 2016-05-11 17:23:08 +01:00
Jos Hickson
835fb947cc Fixed parsing of BoolValue. 2016-05-11 15:36:02 +01:00
Jos Hickson
2b22b611a8 Merge remote-tracking branch 'refs/remotes/google/master' 2016-05-11 09:23:46 +01:00
Jisi Liu
c67879b9fa Merge pull request #1514 from pherl/fix_heap_check 
Fix the command line interface unittest again
 2016-05-10 17:35:08 -07:00