Commit Graph

3629 Commits

Author SHA1 Message Date
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
Jisi Liu
0e4d1ea116 Initial draft for changelog. 2016-05-10 17:32:35 -07:00
Jisi Liu
e8737d8676 Fix the command line interface unittest again
This time move the macro inside namespaces; hopefully will work with the
integration script.
2016-05-10 16:20:08 -07:00
Jisi Liu
cdd3ec7c2f Merge pull request #1513 from pherl/fix-build-protoc
Fix protoc build artifact script.
2016-05-10 15:51:32 -07:00
Jisi Liu
25dd69002f Fix protoc build artifact script.
pbconfig.h has gone. This commit removes the target.
2016-05-10 15:48:54 -07:00
Jisi Liu
5dea2017db Update version numbers for other languages 2016-05-10 15:43:39 -07:00
Jisi Liu
dbed8a0154 Update version numbers for beta3 2016-05-10 14:49:42 -07:00
Thomas Van Lenten
a1938b2aa9 Merge pull request #1510 from thomasvl/nonnull
Declare an init and avoid passing NULL to initWithValue:count:
2016-05-10 11:24:56 -04:00
Thomas Van Lenten
4755bdc5f9 Declare an init and avoid passing NULL to initWithValue:count:
Fixes https://github.com/google/protobuf/issues/1189
2016-05-10 11:15:51 -04:00
Joshua Haberman
4c6259bbe8 Merge pull request #1498 from thomasvl/build_cleanup
Build cleanup
2016-05-09 13:27:27 -07:00
Walter Gray
f4bc9e0ddb Remove confounding and unused #define - breaks boost/predef/other/endian.h 2016-05-06 17:13:02 -07:00
Jisi Liu
d392ed4577 Merge pull request #1502 from pherl/master
Remove accidentally restored deleted files.
2016-05-06 16:25:39 -07:00
Jisi Liu
ce6bec74fd Remove accidentally restored deleted files. 2016-05-06 15:57:06 -07:00
Jisi Liu
9d0f56058a Merge pull request #1494 from pherl/master
Fix the std::string error introduced in integration.
2016-05-06 15:40:58 -07:00
Feng Xiao
76a96d4690 Merge pull request #1499 from beardedN5rd/master
updated README
2016-05-06 15:23:45 -07:00
beardedn5rd
2eb774e602 after comment of Feng Xiao changed the entry to g++ 2016-05-06 22:47:17 +02:00
Feng Xiao
ace2690be1 Merge pull request #1496 from ozkuran/master
Updated README.md
2016-05-06 13:36:37 -07:00
Thomas Van Lenten
b661fb5000 Add the missing maintiner-clean entry for benchmarks 2016-05-06 12:47:41 -04:00
Thomas Van Lenten
ce2ef0d705 Properly express all outputs for the conformance build
- Fixes up `make distclean` and `make maintainer-clean`
- Fixes the build so make is more likely to notice if one of those files is stale/missing.
2016-05-06 12:41:23 -04:00
Thomas Van Lenten
f367642103 Add two missing ignores for conformance directory. 2016-05-06 11:44:42 -04:00
beardedn5rd
b12f630e81 updated README 2016-05-06 14:49:52 +02:00
Mahmut Ali ÖZKURAN
9b3357ddac Updated README.md
Added relative link to cmake guide.
2016-05-06 10:16:28 +03:00
Jon Skeet
5b5e369b18 Merge pull request #1471 from jskeet/any-host
Allow custom type URL prefixes in Any.Pack
2016-05-06 06:29:03 +01:00
Jisi Liu
f8a5c5f746 Fix using std::shared_ptr 2016-05-05 16:34:42 -07:00
Jisi Liu
75e5898513 Fix the std::string error introduced in integration. 2016-05-05 16:04:30 -07:00