aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix breakage of referring to table_ in static funcJisi Liu2016-03-311-1/+1
* Temporarily disable begin is fast test.Jisi Liu2016-03-311-1/+2
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-30114-6935/+4729
|\
| * Merge pull request #1360 from pherl/masterJisi Liu2016-03-301-1/+1
| |\
| | * Use the T() instead of NULL for the default value.Jisi Liu2016-03-291-1/+1
| * | Merge pull request #1295 from haberman/dockerJoshua Haberman2016-03-309-36/+448
| |\ \
| | * | Merge branch 'master' into dockerJosh Haberman2016-03-29101-6889/+4074
| | |\|
| | * | Rearranged and commented files for running under Jenkins.Josh Haberman2016-03-0411-140/+115
| | * | Disable attempt to use ccache for docker build.Josh Haberman2016-03-033-20/+13
| | * | Properly report C++ build time.Josh Haberman2016-03-033-8/+15
| | * | Use a local Maven repository to avoid network fetches during tests.Josh Haberman2016-03-032-0/+31
| | * | Make Java copy into separate directories so the tests can run concurrently.Josh Haberman2016-03-021-5/+9
| | * | Added code to generate XML output file for more granular results.Josh Haberman2016-03-025-11/+122
| | * | Added Ruby 2.1, Oracle Java, and C#.Josh Haberman2016-03-023-21/+76
| | * | Upgrade Python packages using pip.Josh Haberman2016-03-021-1/+7
| | * | Work around tox bug.Josh Haberman2016-03-021-0/+4
| | * | Configure ccache directory.Josh Haberman2016-03-022-2/+8
| | * | Put Maven in batch mode to avoid spamming the logs.Josh Haberman2016-03-021-4/+7
| | * | Install Python deps in Docker image.Josh Haberman2016-03-023-13/+25
| | * | Add another test (javanano), but run it in parallel.Josh Haberman2016-03-022-5/+13
| | * | Properly add JDK deps in the Docker image.Josh Haberman2016-03-023-5/+19
| | * | Try running multiple tests in a row.Josh Haberman2016-03-024-51/+57
| | * | Added ccache support.Josh Haberman2016-03-024-6/+22
| | * | Added some initial shell scripts and docker file.Josh Haberman2016-03-027-39/+200
| * | | Merge pull request #1326 from the-alien/csharp_json_nameJon Skeet2016-03-306-9/+206
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' of https://github.com/google/protobuf into csharp_json_...alien2016-03-298-17/+39
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1358 from thomasvl/travis_tweaksThomas Van Lenten2016-03-292-7/+10
| |\ \ \
| | * | | Mark iOS tests as able to fail.Thomas Van Lenten2016-03-292-7/+10
| |/ / /
| * | | Merge pull request #1350 from thomasvl/over_releaseThomas Van Lenten2016-03-241-2/+0
| |\ \ \
| | * | | The message was autoreleased, the -releases are an over release.Thomas Van Lenten2016-03-241-2/+0
| |/ / /
| * | | Merge pull request #1345 from smparkes/smparkes/well-known-protosFeng Xiao2016-03-231-0/+6
| |\ \ \
| | * | | export well known protosSteven Parkes2016-03-221-0/+6
| |/ / /
| * | | Merge pull request #1344 from topillar/patch-1Feng Xiao2016-03-221-1/+1
| |\ \ \
| | * | | Update coded_stream.htopillar2016-03-221-1/+1
| |/ / /
| * | | Merge pull request #1335 from pradeepg26/masterFeng Xiao2016-03-211-4/+3
| |\ \ \
| | * | | Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
| * | | | Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creationThomas Van Lenten2016-03-213-3/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Only create the readonlySemaphore on demand.Thomas Van Lenten2016-03-213-3/+19
| |/ / /
| | * | Code review fixesalien2016-03-295-7/+5
| | * | csharp: add support for the json_name optionalien2016-03-186-8/+207
| |/ /
| * | Merge pull request #1325 from thomasvl/shrink_overheadThomas Van Lenten2016-03-1758-5160/+1015
| |\ \
| | * | Shrink ObjC overhead (generated size and some runtime sizes)Thomas Van Lenten2016-03-1758-5160/+1015
| |/ /
| * | Merge pull request #1318 from smparkes/smparkes/grpcFeng Xiao2016-03-142-0/+33
| |\ \
| | * | add java/util support based on java/util/pom.xmlSteven Parkes2016-03-112-0/+33
| * | | Merge pull request #1291 from sergiocampama/develThomas Van Lenten2016-03-141-1/+2
| |\ \ \
| | * | | Adds more information to Objective C error when the expected objc_class_prefi...Sergio Campama2016-03-031-1/+2
| | | |/ | | |/|
| * | | Merge pull request #1312 from petewarden/masterJisi Liu2016-03-121-2/+43
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'upstream/master'Pete Warden2016-03-0976-2393/+3886
| | |\ \
| | * | | Added iOS settings to Bazel buildPete Warden2016-03-091-3/+19
| | * | | Updated library generation with iOS optionsPete Warden2016-02-231-2/+27