Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | List python_cpp as failing on OS X | Thomas Van Lenten | 2016-02-18 | 1 | -0/+4 |
| | |||||
* | Merge pull request #1254 from thomasvl/disable_xctool_updates | Thomas Van Lenten | 2016-02-18 | 2 | -8/+8 |
|\ | | | | | Disable the xctool updates | ||||
| * | Disable the xctool updates | Thomas Van Lenten | 2016-02-18 | 2 | -8/+8 |
|/ | | | | | | | | In light of https://github.com/google/protobuf/issues/1232, disable the xctool update so we stay on 0.2.7 which seems to work better. Remove the passing of -newSimulatorInstance since the older xctool doesn't support it. | ||||
* | Merge pull request #1239 from jskeet/call_generate_protos | Jon Skeet | 2016-02-18 | 2 | -1/+6 |
|\ | | | | | Generate C# code whenever descriptor.proto changes | ||||
| * | Generate C# code whenever descriptor.proto changes | Jon Skeet | 2016-02-15 | 2 | -1/+6 |
| | | | | | | | | | | | | | | This is a start to fixing issue #1212. It won't help for test protos, conformance etc, but it will definitely be better than nothing, and would have highlighted a change in descriptor.proto which broken C# earlier. | ||||
* | | Merge pull request #1229 from keveman/unlimited_binary_proto | Joshua Haberman | 2016-02-17 | 2 | -4/+23 |
|\ \ | | | | | | | Added ALLOW_UNLIMITED_BINARY_PROTO macro and setting it when | ||||
| * | | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when | Manjunath Kudlur | 2016-02-16 | 2 | -4/+23 |
| | | | | | | | | | | | | | | | | | | --allow_oversize_protos=true is passed to bazel build. When this macro is set, SetTotalBytesLimit is called to remove the 64MB limit on binary protos when during ParseFromString. | ||||
* | | | Merge pull request #1241 from jskeet/more-merge-wrapper-tests | Jan Tattermusch | 2016-02-17 | 1 | -2/+41 |
|\ \ \ | | | | | | | | | Add more tests around merging wrappers | ||||
| * | | | Add more tests around merging wrappers | Jon Skeet | 2016-02-15 | 1 | -2/+41 |
| | |/ | |/| | | | | | | | This was in an attempt to fix the wrapper handling corner case, but it's really fiddly. | ||||
* | | | Merge pull request #260 from ejsd1989/issue-#242 | Joshua Haberman | 2016-02-16 | 2 | -4/+2 |
|\ \ \ | | | | | | | | | Removes redundant null pointer checks checks | ||||
| * | | | Removal of null check | eissajamil@gmail.com | 2015-03-29 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | Removed the redundant check for NULL which is already handled by using delete | ||||
| * | | | Removal of null check | eissajamil@gmail.com | 2015-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Removed the redundant check for NULL which is already correctly handled by used the delete | ||||
* | | | | Merge pull request #1224 from google/rubysentinel | Joshua Haberman | 2016-02-16 | 1 | -9/+9 |
|\ \ \ \ | | | | | | | | | | | Removed 'optional' from proto3 syntax file. | ||||
| * | | | | Removed 'optional' from proto3 syntax file. | Josh Haberman | 2016-02-10 | 1 | -9/+9 |
| | | | | | |||||
* | | | | | Merge pull request #1247 from thomasvl/xctool_plain_output | Thomas Van Lenten | 2016-02-16 | 1 | -5/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Move the xctool use of -reporter into a common spot and always use "plain" to get more readable logs on travis. | ||||
| * | | | | | Move the xctool use of -reporter into a common spot and always use "plain" ↵ | Thomas Van Lenten | 2016-02-16 | 1 | -5/+4 |
|/ / / / / | | | | | | | | | | | | | | | | to get more readable logs on travis. | ||||
* | | | | | Merge pull request #1245 from thomasvl/tweak_xctool_ios_run | Thomas Van Lenten | 2016-02-16 | 1 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Tweak the xctool run for iOS tests to try and sort out flake | ||||
| * | | | | | Tweak the xctool run for iOS tests to try and sort out flake | Thomas Van Lenten | 2016-02-16 | 1 | -1/+7 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | - Use the plain reporter for slightly more readable logs. - Add -newSimulatorInstance to the run-tests to see if it helps with flake. | ||||
* | | | | | Merge pull request #1244 from thomasvl/bump_xcode_version | Thomas Van Lenten | 2016-02-16 | 3 | -5/+16 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Bump up travis to Xcode 7.2 | ||||
| * | | | | Bump up travis to Xcode 7.2 | Thomas Van Lenten | 2016-02-16 | 3 | -5/+16 |
|/ / / / | | | | | | | | | | | | | | | | | - Update simulator versions used. - Mark the iOS tests as flaky while trying to dig out the root cause. | ||||
* | | | | Merge pull request #1226 from jcanizales/patch-1 | Paul Yang | 2016-02-12 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Include 'source' attribute in the podspec | ||||
| * | | | | Include 'source' attribute in the podspec | Jorge Canizales | 2016-02-10 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | The new version of Cocoapods requires it even when using the podspec locally. | ||||
* | | | | | Merge pull request #1144 from dongjoon-hyun/remove_redundant_the | Joshua Haberman | 2016-02-11 | 10 | -12/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Remove redundant `the`. | ||||
| * | | | | Rewrap the line | Dongjoon Hyun | 2016-02-11 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Remove redundant `the` in comments. | Dongjoon Hyun | 2016-02-03 | 10 | -11/+11 |
| | | | | | |||||
* | | | | | Merge pull request #997 from anderscarling/better_errors | Joshua Haberman | 2016-02-11 | 3 | -6/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | ruby: Better exception text for common cases | ||||
| * | | | | | Invoke super implementation instead of raising error | Anders Carling | 2015-11-23 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add field name to initialization map exceptions | Anders Carling | 2015-11-20 | 3 | -5/+22 |
| | | | | | | |||||
| * | | | | | Use same exception class in ruby and jruby | Anders Carling | 2015-11-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Raise NoMethodError for unknown fields | Anders Carling | 2015-11-20 | 3 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | More informative and more ruby-like | ||||
* | | | | | | Merge pull request #1178 from lebauce/fix-readme-typos | Joshua Haberman | 2016-02-11 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix typos in README.md | ||||
| * | | | | | | Fix typos in README.md | Sylvain Baubeau | 2016-01-25 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1179 from ParthKolekar/python-examples-with | Joshua Haberman | 2016-02-11 | 2 | -9/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Updated python examples to use with. | ||||
| * | | | | | | | Updated python examples to use with. | Parth Kolekar | 2016-01-26 | 2 | -9/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #1194 from Photonios/master | Joshua Haberman | 2016-02-11 | 6 | -37/+37 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed unused parameters and extra ';' | ||||
| * | | | | | | | Fixed unused parameters and extra ';' | Swen Kooij | 2016-01-28 | 6 | -37/+37 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1217 from jhump/jh/make-warning-useful | Joshua Haberman | 2016-02-11 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | make 'no syntax' warning useful by showing which file | ||||
| * | | | | | | | | make 'no syntax' warning useful by showing which file | Joshua Humphries | 2016-02-06 | 1 | -3/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1218 from jskeet/nuspec-dependencies | Jan Tattermusch | 2016-02-11 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | nuspec dependency fixes | ||||
| * | | | | | | | | nuspec dependency fixes | Jon Skeet | 2016-02-08 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly don't add any dependencies for "old" platforms, to avoid unnecessary dependencies in those cases. Fixes issue #1203. | ||||
* | | | | | | | | | Merge pull request #1225 from google/nmakedoc | Joshua Haberman | 2016-02-10 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | Clarified that 'nmake' must be run before 'nmake check'. | ||||
| * | | | | | | | | Clarified that 'nmake' must be run before 'nmake check'. | Josh Haberman | 2016-02-10 | 1 | -1/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1185 from kkm000/icl-fix | Joshua Haberman | 2016-02-10 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix Intel compiler warnings in include files on Windows | ||||
| * | | | | | | | | Fix Intel compiler warnings in include files on Windows | kkm | 2016-01-27 | 2 | -4/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1220 from jtattermusch/add_strong_name_key | Jan Tattermusch | 2016-02-10 | 4 | -3/+7 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Check in strong name key. | ||||
| * | | | | | | | | Add a link | Jan Tattermusch | 2016-02-10 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Use checked-in key to build ReleaseSigned | Jan Tattermusch | 2016-02-09 | 2 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | add private key for strong name assemblies | Jan Tattermusch | 2016-02-09 | 2 | -1/+5 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #1214 from haberman/binarygem | Joshua Haberman | 2016-02-08 | 4 | -8/+26 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Added support for binary gems. | ||||
| * | | | | | | | Merge pull request #1 from nicolasnoble/bin-gems | Joshua Haberman | 2016-02-05 | 2 | -3/+9 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Few fixes. |