aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* generic atomicops: Use strong compare_exchangeJulien Brianceau2016-10-281-5/+5
* Adds pushLimit: and popLimit: into GPBCodedInputStream (#2297)Sergio Campamá2016-10-272-0/+29
* Trigger update of docker for new changes in #2282. (#2288)Paul Yang2016-10-272-0/+2
* Merge pull request #2290 from ramrunner/OpenBSDsupportFeng Xiao2016-10-261-2/+2
|\
| * define no_threadlocal on OpenBSDramrunner2016-10-261-2/+2
|/
* Merge pull request #2284 from pherl/plugin_optJisi Liu2016-10-263-17/+93
|\
| * Add comments about converting directives into PluginNameJisi Liu2016-10-261-1/+2
| * Support extra parameters for plugins.Jisi Liu2016-10-253-16/+91
* | Fix pure php implementation for 32-bit machine. (#2282)Paul Yang2016-10-2517-392/+545
|/
* Merge pull request #2274 from nmittler/gaeFeng Xiao2016-10-201-5/+45
|\
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
|/
* Merge pull request #2264 from rshin/masterFeng Xiao2016-10-192-4/+8
|\
| * Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOSRichard Shin2016-10-191-0/+4
| * Place Python extensions correctly in Bazel build.Richard Shin2016-10-181-4/+4
|/
* Merge pull request #2254 from JasonLunn/patch-1Feng Xiao2016-10-161-0/+2
|\
| * Use git clean before installing via bundlerJason Lunn2016-10-141-0/+2
|/
* Merge pull request #1959 from abergmeier-dsfishlabs/feature/cppFeng Xiao2016-10-131-7/+17
|\
| * Need to expose generated protobuf C++ headers so they can actually be accesse...Andreas Bergmeier2016-08-151-7/+17
* | Merge pull request #2251 from TeBoring/masterPaul Yang2016-10-137-32/+84
|\ \
| * | Merge 3.1.x into master.Bo Yang2016-10-137-32/+84
|/| |
| * | Fix the bug that message without namespace is not found in the descriptor poo...Paul Yang2016-10-116-23/+83
| * | Merge pull request #2203 from mrry/msvc_fixFeng Xiao2016-10-111-9/+1
| |\ \
| | * | Fix MSVC build when HAVE_LONG_LONG is defined.Derek Murray2016-09-291-9/+1
| * | | Fix python_cpp test on Mac. Link staticly when building extension, so that th...Paul Yang2016-10-072-2/+3
| * | | Add csharp/build_tools.sh for dist check.Bo Yang2016-10-061-0/+1
| * | | Fix compile error for php on Mac.Bo Yang2016-10-0511-39/+55
| * | | Fix segmentation fault when ZTS is defined.Bo Yang2016-10-055-34/+39
| * | | PHP: fix ZTS tsrm_ls errors (#2189)Stanley Cheung2016-10-046-59/+69
| * | | Merge pull request #2193 from acozzette/common-js-fixAdam Cozzette2016-10-044-14/+44
| |\ \ \
| | * | | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-09-274-14/+44
| * | | | Add test for php zts build.Bo Yang2016-10-041-4/+16
| * | | | Prepare jenkins for testing php zts build.Bo Yang2016-10-041-0/+6
| * | | | Merge pull request #2204 from acozzette/enum-namesAdam Cozzette2016-10-042-9/+27
| |\ \ \ \
| | * | | | Do strict enum name checking only for proto3Adam Cozzette2016-10-042-9/+27
| |/ / / /
| * | | | Add travis test on Mac for php.Bo Yang2016-10-032-9/+20
| * | | | Test php5.5_c test on jenkinsBo Yang2016-10-033-30/+36
| * | | | Trigger automated tests for php.Bo Yang2016-09-301-0/+6
| * | | | Set up environment for php automated tests.Bo Yang2016-09-301-6/+46
| * | | | Add php test script for automated tests.Bo Yang2016-09-301-8/+63
| | |/ / | |/| |
| * | | Add script to build Google.Protobuf.Tools for csharp.Bo Yang2016-09-281-0/+52
| * | | Merge pull request #2196 from haberman/nodefixJoshua Haberman2016-09-281-0/+12
| |\ \ \ | | |/ / | |/| |
| | * | Added alias getFieldProto3 as used by older generated code.Josh Haberman2016-09-281-0/+12
| |/ /
| * | Fixing inconsistent php version number.Bo Yang2016-09-262-2/+2
| * | Merge pull request #2181 from google/jtattermusch-patch-2Feng Xiao2016-09-261-3/+0
| |\ \
| | * | Update README.mdJan Tattermusch2016-09-261-3/+0
| |/ /
| * | Fix MSVC stack overflow issue.Feng Xiao2016-09-231-0/+5
| * | Add php files for make dist.v3.1.0-alpha-1v3.1.0Bo Yang2016-09-234-4/+55
| * | Update change log for 3.1.0 (#2173)Paul Yang2016-09-231-0/+80
| * | Merge pull request #2175 from xfxyjwf/fix_jsonFeng Xiao2016-09-233-7/+25
| |\ \
| | * | Force a rebuild of Jenkins docker image.Feng Xiao2016-09-231-1/+1