Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #1360 from pherl/master | Jisi Liu | 2016-03-30 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Use the T() instead of NULL for the default value. | Jisi Liu | 2016-03-29 | 1 | -1/+1 | |
* | | | | | Merge pull request #1295 from haberman/docker | Joshua Haberman | 2016-03-30 | 9 | -36/+448 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Merge branch 'master' into docker | Josh Haberman | 2016-03-29 | 101 | -6889/+4074 | |
| |\| | | | ||||||
| * | | | | Rearranged and commented files for running under Jenkins. | Josh Haberman | 2016-03-04 | 11 | -140/+115 | |
| * | | | | Disable attempt to use ccache for docker build. | Josh Haberman | 2016-03-03 | 3 | -20/+13 | |
| * | | | | Properly report C++ build time. | Josh Haberman | 2016-03-03 | 3 | -8/+15 | |
| * | | | | Use a local Maven repository to avoid network fetches during tests. | Josh Haberman | 2016-03-03 | 2 | -0/+31 | |
| * | | | | Make Java copy into separate directories so the tests can run concurrently. | Josh Haberman | 2016-03-02 | 1 | -5/+9 | |
| * | | | | Added code to generate XML output file for more granular results. | Josh Haberman | 2016-03-02 | 5 | -11/+122 | |
| * | | | | Added Ruby 2.1, Oracle Java, and C#. | Josh Haberman | 2016-03-02 | 3 | -21/+76 | |
| * | | | | Upgrade Python packages using pip. | Josh Haberman | 2016-03-02 | 1 | -1/+7 | |
| * | | | | Work around tox bug. | Josh Haberman | 2016-03-02 | 1 | -0/+4 | |
| * | | | | Configure ccache directory. | Josh Haberman | 2016-03-02 | 2 | -2/+8 | |
| * | | | | Put Maven in batch mode to avoid spamming the logs. | Josh Haberman | 2016-03-02 | 1 | -4/+7 | |
| * | | | | Install Python deps in Docker image. | Josh Haberman | 2016-03-02 | 3 | -13/+25 | |
| * | | | | Add another test (javanano), but run it in parallel. | Josh Haberman | 2016-03-02 | 2 | -5/+13 | |
| * | | | | Properly add JDK deps in the Docker image. | Josh Haberman | 2016-03-02 | 3 | -5/+19 | |
| * | | | | Try running multiple tests in a row. | Josh Haberman | 2016-03-02 | 4 | -51/+57 | |
| * | | | | Added ccache support. | Josh Haberman | 2016-03-02 | 4 | -6/+22 | |
| * | | | | Added some initial shell scripts and docker file. | Josh Haberman | 2016-03-02 | 7 | -39/+200 | |
* | | | | | Merge pull request #1326 from the-alien/csharp_json_name | Jon Skeet | 2016-03-30 | 6 | -9/+206 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/google/protobuf into csharp_json_... | alien | 2016-03-29 | 8 | -17/+39 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #1358 from thomasvl/travis_tweaks | Thomas Van Lenten | 2016-03-29 | 2 | -7/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Mark iOS tests as able to fail. | Thomas Van Lenten | 2016-03-29 | 2 | -7/+10 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1350 from thomasvl/over_release | Thomas Van Lenten | 2016-03-24 | 1 | -2/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | The message was autoreleased, the -releases are an over release. | Thomas Van Lenten | 2016-03-24 | 1 | -2/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1345 from smparkes/smparkes/well-known-protos | Feng Xiao | 2016-03-23 | 1 | -0/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | export well known protos | Steven Parkes | 2016-03-22 | 1 | -0/+6 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1344 from topillar/patch-1 | Feng Xiao | 2016-03-22 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update coded_stream.h | topillar | 2016-03-22 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1335 from pradeepg26/master | Feng Xiao | 2016-03-21 | 1 | -4/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Allow custom URLs for Any in JsonFormat | Pradeep Gollakota | 2016-03-18 | 1 | -4/+3 | |
* | | | | | | Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creation | Thomas Van Lenten | 2016-03-21 | 3 | -3/+19 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Only create the readonlySemaphore on demand. | Thomas Van Lenten | 2016-03-21 | 3 | -3/+19 | |
|/ / / / / | ||||||
| * | | | | Code review fixes | alien | 2016-03-29 | 5 | -7/+5 | |
| * | | | | csharp: add support for the json_name option | alien | 2016-03-18 | 6 | -8/+207 | |
|/ / / / | ||||||
* | | | | Merge pull request #1325 from thomasvl/shrink_overhead | Thomas Van Lenten | 2016-03-17 | 58 | -5160/+1015 | |
|\ \ \ \ | ||||||
| * | | | | Shrink ObjC overhead (generated size and some runtime sizes) | Thomas Van Lenten | 2016-03-17 | 58 | -5160/+1015 | |
|/ / / / | ||||||
* | | | | Merge pull request #1318 from smparkes/smparkes/grpc | Feng Xiao | 2016-03-14 | 2 | -0/+33 | |
|\ \ \ \ | ||||||
| * | | | | add java/util support based on java/util/pom.xml | Steven Parkes | 2016-03-11 | 2 | -0/+33 | |
* | | | | | Merge pull request #1291 from sergiocampama/devel | Thomas Van Lenten | 2016-03-14 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Adds more information to Objective C error when the expected objc_class_prefi... | Sergio Campama | 2016-03-03 | 1 | -1/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #1312 from petewarden/master | Jisi Liu | 2016-03-12 | 1 | -2/+43 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Pete Warden | 2016-03-09 | 76 | -2393/+3886 | |
| |\ \ \ \ | ||||||
| * | | | | | Added iOS settings to Bazel build | Pete Warden | 2016-03-09 | 1 | -3/+19 | |
| * | | | | | Updated library generation with iOS options | Pete Warden | 2016-02-23 | 1 | -2/+27 | |
* | | | | | | Merge pull request #1278 from smparkes/master | Jisi Liu | 2016-03-11 | 2 | -9/+27 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | pass correct args to protoc for java wellknown protos when used as an externa... | Steven Parkes | 2016-03-10 | 2 | -9/+27 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1317 from benvanik/patch-1 | Feng Xiao | 2016-03-11 | 1 | -1/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |