aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Specify arch versionBo Yang2018-02-231-0/+23
* Build wheelBo Yang2018-02-182-2/+12
* Test 7zBo Yang2018-02-181-1/+2
* Download protocBo Yang2018-02-181-0/+7
* Add appveyor.ymlBo Yang2018-02-171-0/+81
* Try lower mac target versionBo Yang2018-02-031-1/+1
* Explicitly set MACOSX_DEPLOYMENT_TARGETBo Yang2018-02-021-0/+1
* Update osx_image to xcode9.2Charleneluo2018-02-011-0/+5
* Fix after install testBo Yang2018-01-261-1/+1
* Fix build on linuxBo Yang2018-01-262-4/+32
* cd to the directory of pythonBo Yang2018-01-251-1/+1
* Test working directoryBo Yang2018-01-241-4/+3
* Add config.shBo Yang2018-01-241-0/+17
* Initialize .travis.ymlBo Yang2018-01-235-185/+89
* Initialize python-wheel branchBo Yang2018-01-231950-765602/+0
* Migrate away from deprecated OSAtomic APIs. (#4184)Jonathan Dierksen2018-01-226-16/+20
* Add DiscardUnknownFields support for C#Jon Skeet2018-01-155-56/+173
* Merge pull request #4158 from BSBandme/FixBenchmarksYilun Chong2018-01-106-62/+60
|\
| * Update py_benchmark.pyYilun Chong2018-01-101-1/+1
| * Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, f...Yilun Chong2018-01-096-61/+59
|/
* Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\
| * Update time_test.ccAnton Fedorov2018-01-051-0/+53
* | Merge pull request #4147 from datacompboy/patch-1Adam Cozzette2018-01-081-2/+2
|\ \
| * | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
| |/
* | Merge pull request #4132 from BSBandme/JavaCaliperCounterYilun Chong2018-01-052-12/+64
|\ \
| * | Add counter to Java benchmarkYilun Chong2018-01-052-12/+64
* | | Merge pull request #4065 from BSBandme/python_benchmark_realYilun Chong2018-01-055-8/+284
|\ \ \ | |_|/ |/| |
| * | Add python benchmarkYilun Chong2018-01-055-8/+284
| |/
* | Merge pull request #4131 from pherl/mergeJisi Liu2018-01-0455-218/+853
|\ \
| * \ Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-032-7/+4
| |\ \
| | * \ Merge pull request #4124 from pherl/nullptrJisi Liu2018-01-031-1/+1
| | |\ \
| | | * | remove nullptrJisi Liu2018-01-021-1/+1
| | * | | Merge pull request #4090 from pherl/nopasswordJisi Liu2018-01-031-6/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix uploading binary wheel.Jisi Liu2017-12-221-6/+3
| * | | | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-0354-212/+850
| |\| | |
| | * | | Merge pull request #4089 from pherl/nocacheJisi Liu2017-12-221-1/+2
| | |\| |
| | | * | Disable pip cache when testing uploaded packagesJisi Liu2017-12-221-1/+2
| | |/ /
| | * | Merge pull request #4073 from pherl/changelogv3.5.1Jisi Liu2017-12-201-0/+31
| | |\ \
| | | * | Update changelogJisi Liu2017-12-201-1/+1
| | | * | Update changelogJisi Liu2017-12-191-2/+7
| | | * | Merge branch '3.5.x' of github.com:google/protobuf into changelogJisi Liu2017-12-1926-28/+28
| | | |\ \
| | | * | | Update changelog for 3.5.1Jisi Liu2017-12-191-0/+26
| | * | | | Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
| | |\ \ \ \
| | | * | | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #4072 from google/jieluoJisi Liu2017-12-1955-769/+4529
| | |\ \ \ \
| | | * | | | Cherrypick for csharp, including:Jie Luo2017-12-1955-769/+4529
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #4076 from pherl/stringbackJisi Liu2017-12-191-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fix string::back() usage in googletest.ccJisi Liu2017-12-191-1/+1
| | |/ / /
| | * | | Merge pull request #4074 from pherl/mapatJisi Liu2017-12-191-1/+1
| | |\ \ \
| | | * | | Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
| | | |/ /