aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix for CommonJS tests.Josh Haberman2016-04-072-8/+30
* Merge pull request #1381 from pherl/internal-mergeJisi Liu2016-04-01270-4796/+34417
|\
| * Merge branch 'master' into internal-mergeJisi Liu2016-04-01270-4796/+34417
|/|
| * Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-0112-106/+218
| |\ | |/ |/|
* | Merge pull request #1353 from keveman/masterJoshua Haberman2016-04-012-17/+30
|\ \
| * | Linking the cpp implementation extension statically with libprotobufManjunath Kudlur2016-04-012-17/+30
* | | Merge pull request #1377 from jskeet/remove-duplicate-testsJon Skeet2016-04-012-2/+0
|\ \ \
| * | | Remove duplicate test cases.Jon Skeet2016-04-012-2/+0
* | | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersThomas Van Lenten2016-04-012-0/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Add -position and -isAtEnd for use when manually parsing input streams.Thomas Van Lenten2016-04-012-0/+17
|/ / /
* | | Merge pull request #1369 from jskeet/tools-nuspecJan Tattermusch2016-03-312-14/+37
|\ \ \ | |/ / |/| |
| * | Remove duplicate lineJon Skeet2016-03-311-1/+0
| * | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain pr...Jon Skeet2016-03-312-14/+38
* | | Merge pull request #1371 from keveman/oversize_protosJoshua Haberman2016-03-312-11/+94
|\ \ \
| * | | Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
* | | | Merge pull request #1366 from xyzzyz/int128_ostreamFeng Xiao2016-03-311-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Replace #include <iostream> with #include <ostream>Adam Michalik2016-03-301-1/+1
* | | | Merge pull request #1362 from jskeet/tweak_json_nameJan Tattermusch2016-03-301-61/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Refactoring of FieldDescriptorJon Skeet2016-03-301-61/+39
| |/ /
| | * Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
| | * Do not let windows.h define min/max macrosJisi Liu2016-04-011-0/+1
| | * Allow bigobj for map_unittestJisi Liu2016-04-011-0/+2
| | * Fix re-definition issue of winsock.h and winsock2.hJisi Liu2016-03-311-0/+1
| | * Disable sign-compare warning.Jisi Liu2016-03-311-1/+3
| | * Fix signed-compare warning.Jisi Liu2016-03-311-1/+1
| | * revert unexpected change for py26Jisi Liu2016-03-311-1/+4
| | * Fix WIN32 build for map_test.Jisi Liu2016-03-311-0/+6
| | * Remove export macros for classes nested in a template class.Jisi Liu2016-03-311-3/+3
| | * Fix javanano packageJisi Liu2016-03-311-0/+3
| | * Fix json_format.py in py26Jisi Liu2016-03-311-2/+4
| | * 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