Commit Graph

5376 Commits

Author SHA1 Message Date
Feng Xiao
1d02e45468
Merge pull request #4224 from davido/drop_java_6_support
Drop java 6 support
2018-01-24 23:41:32 -08:00
David Ostrovsky
019ceea4b3 Drop java 6 support
Fixes #4220.
2018-01-25 06:54:38 +01:00
Feng Xiao
80e016e838
Merge pull request #4205 from xuwei-k/patch-2
fix typo in FieldMaskTree.java comment
2018-01-23 16:06:13 -08:00
Jonathan Dierksen
a721bf6d29 Migrate away from deprecated OSAtomic APIs. (#4184)
* Migrate away from deprecated OSAtomic APIs.
2018-01-22 16:26:39 -05:00
kenji yoshida
1c3b20b122
fix typo in FieldMaskTree.java comment 2018-01-22 00:09:36 +09:00
Jon Skeet
47b7d2c7ca Add DiscardUnknownFields support for C#
By default, unknown fields are preserved when parsing. To discard
them, use a parser configured to do so:

var parser = MyMessage.Parser.WithDiscardUnknownFields(true);
2018-01-15 02:53:45 -05:00
Yilun Chong
9f80df0269
Merge pull request #4158 from BSBandme/FixBenchmarks
Fix java benchmark to use parser, fix cpp benchmark new arena to use …
2018-01-10 17:06:01 -08:00
Yilun Chong
473a810975
Update py_benchmark.py 2018-01-10 10:25:24 -08:00
Yilun Chong
fa60e550ec Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, format some files 2018-01-09 10:24:50 -08:00
Adam Cozzette
b77aa8011d
Merge pull request #4148 from datacompboy/patch-2
Add more tests to time_test
2018-01-08 10:41:54 -08:00
Adam Cozzette
d4afdba83d
Merge pull request #4147 from datacompboy/patch-1
Fix ValidateDateTime: check day instead month
2018-01-08 10:40:08 -08:00
Yilun Chong
bab843b8b9
Merge pull request #4132 from BSBandme/JavaCaliperCounter
Java caliper counter
2018-01-05 16:33:17 -08:00
Yilun Chong
195253c3f6 Add counter to Java benchmark 2018-01-05 16:28:51 -08:00
Yilun Chong
4adc5a48c0
Merge pull request #4065 from BSBandme/python_benchmark_real
Add python benchmark
2018-01-05 15:20:10 -08:00
Anton Fedorov
091eeb1261
Update time_test.cc
Better test coverage for datetime validation.
2018-01-05 22:12:00 +01:00
Anton Fedorov
473c5cff76
Fix ValidateDateTime: check day instead month
Found with PVS-Studio static analyser, see 
https://www.viva64.com/en/b/0550/
2018-01-05 22:09:44 +01:00
Yilun Chong
2fc69b1561 Add python benchmark 2018-01-05 11:20:40 -08:00
Jisi Liu
a3868af12b
Merge pull request #4131 from pherl/merge
Merge 3.5.x branch into master
2018-01-04 14:26:24 -08:00
Adam Cozzette
eca1d2a711
Merge pull request #4116 from amandeepgautam/master
whitelisting aix platform as it has sched_yield
2018-01-03 13:26:22 -08:00
Amandeep Gautam
0c0d481c69 whitelisting aix platform as it has sched_yield 2018-01-03 11:28:42 -08:00
Thomas Van Lenten
4588e6e2b9 Force a copy when saving the NSData that came from another. 2018-01-03 13:12:29 -05:00
Yilun Chong
43caa38d6e
Merge pull request #4014 from BSBandme/JavaCaliper
Add caliper supported to java benchmark
2018-01-03 09:42:26 -08:00
Jisi Liu
ec826c5a59 Merge remote-tracking branch 'origin/3.5.x' into master 2018-01-03 09:28:58 -08:00
Jisi Liu
383a4941d5 Merge remote-tracking branch 'origin/3.5.x' into master 2018-01-03 09:28:40 -08:00
Jisi Liu
39f577c38e
Merge pull request #4124 from pherl/nullptr
remove nullptr
2018-01-03 09:20:23 -08:00
Jisi Liu
5b1caea024
Merge pull request #4090 from pherl/nopassword
Fix uploading binary wheel.
2018-01-03 09:14:54 -08:00
Thomas Van Lenten
156161dfcd Properly copy maps with string keys but pod values.
Add tests to cover all the common special casing in the runtime code to
ensure things come out correctly.
2018-01-03 11:46:03 -05:00
Yilun Chong
aca6c15598 Fix some bug 2018-01-02 15:23:17 -08:00
Jisi Liu
4f3d8657c3 remove nullptr 2018-01-02 14:13:54 -08:00
Yilun Chong
a147a21376 Changed README 2018-01-02 09:57:04 -08:00
kvukic
8529f2aee3 Resolved issue #3510. Malformed errorr messages replaced with meaningful description 2017-12-29 11:33:47 -05:00
Jisi Liu
8fc40b5502 Fix uploading binary wheel.
The script now takes two prompt for user name and password. One single
input redirection no longer works.
2017-12-22 12:05:37 -08:00
Jisi Liu
88e5573b9a
Merge pull request #4089 from pherl/nocache
Disable pip cache when testing uploaded packages
2017-12-22 11:55:35 -08:00
Jisi Liu
7ad8e7ad59 Disable pip cache when testing uploaded packages
Otherwise, pip complains "cannot find a version satisfies the
requirement." I suspect it was due to caching issues. I usued to
manually add a `sleep 30` between the upload and the installation test
which is quite unstable.
2017-12-22 11:47:13 -08:00
Feng Xiao
099d997591
Merge pull request #4083 from matt-kwong/kokoro_jobs
Shard 64-bit Linux languages into different Kokoro jobs
2017-12-21 11:01:07 -08:00
Matt Kwong
0b2be3caaf Shard 64-bit Linux languages into different Kokoro jobs 2017-12-20 18:18:41 -08:00
Feng Xiao
4b2977b396
Merge pull request #4082 from matt-kwong/kokoro_jobs
Migrate Jenkins jobs to Kokoro
2017-12-20 17:45:57 -08:00
Matt Kwong
ae49cfd1a4 Collect xml results for Kokoro 2017-12-20 16:28:41 -08:00
Jisi Liu
106ffc04be
Merge pull request #4073 from pherl/changelog
Update changelog for 3.5.1
2017-12-20 15:07:13 -08:00
Jisi Liu
d69f33304f
Merge pull request #4080 from pherl/arm64
Add support for Windows ARM64 build
2017-12-20 15:06:14 -08:00
Matt Kwong
6003a61255 Make Kokoro job pull Dockerimage from Dockerhub 2017-12-20 14:56:13 -08:00
Miradham Kamilov
ad8a82ee75 Add support for Windows ARM64 build 2017-12-20 14:52:14 -08:00
Jisi Liu
b5f09c1ee0
Merge pull request #4077 from mkamilov/master
Add support for Windows ARM64 build
2017-12-20 14:48:30 -08:00
Feng Xiao
a5b743f8ae
Merge pull request #4030 from cyyber/master
Calling Keychecker before checking key in MessageMap
2017-12-20 12:07:46 -08:00
Jisi Liu
7bf1e1919a Update changelog 2017-12-20 10:59:22 -08:00
Adam Cozzette
1e418e4e54
Merge pull request #4068 from wsw2016/fix_4032
resolved issue 4032 and added a unit test
2017-12-20 09:42:12 -08:00
Ubuntu
ac1fdd1637 line breaks adjsted 2017-12-20 09:23:16 +00:00
Ubuntu
e68caa3e6a formatting issues 2017-12-20 09:14:44 +00:00
Jisi Liu
d106399d39
Merge pull request #4072 from google/jieluo
Cherrypick for csharp, including:
2017-12-19 17:45:56 -08:00
Jisi Liu
6c3c7f6d5d
Merge pull request #4076 from pherl/stringback
Fix string::back() usage in googletest.cc
2017-12-19 15:54:18 -08:00