aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Disable thread local storage for OSX < 10.7Gravatar Gregor Jasny2016-02-19
|
* Merge pull request #1240 from jskeet/validate_groupGravatar Jan Tattermusch2016-02-18
|\ | | | | Validate that end-group tags match their corresponding start-group tags
* \ Merge pull request #1258 from haberman/releasenotesGravatar Joshua Haberman2016-02-18
|\ \ | | | | | | Some fixes for the most recent release notes.
| * | Some fixes for the most recent release notes.Gravatar Josh Haberman2016-02-18
|/ /
* | Merge pull request #1255 from thomasvl/mark_os_x_python_cpp_failingGravatar Thomas Van Lenten2016-02-18
|\ \ | | | | | | List python_cpp as failing on OS X
| * | List python_cpp as failing on OS XGravatar Thomas Van Lenten2016-02-18
|/ /
* | Merge pull request #1254 from thomasvl/disable_xctool_updatesGravatar Thomas Van Lenten2016-02-18
|\ \ | | | | | | Disable the xctool updates
| * | Disable the xctool updatesGravatar Thomas Van Lenten2016-02-18
|/ / | | | | | | | | | | | | | | 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_protosGravatar Jon Skeet2016-02-18
|\ \ | | | | | | Generate C# code whenever descriptor.proto changes
* \ \ Merge pull request #1229 from keveman/unlimited_binary_protoGravatar Joshua Haberman2016-02-17
|\ \ \ | | | | | | | | Added ALLOW_UNLIMITED_BINARY_PROTO macro and setting it when
* \ \ \ Merge pull request #1241 from jskeet/more-merge-wrapper-testsGravatar Jan Tattermusch2016-02-17
|\ \ \ \ | | | | | | | | | | Add more tests around merging wrappers
* \ \ \ \ Merge pull request #260 from ejsd1989/issue-#242Gravatar Joshua Haberman2016-02-16
|\ \ \ \ \ | | | | | | | | | | | | Removes redundant null pointer checks checks
* \ \ \ \ \ Merge pull request #1224 from google/rubysentinelGravatar Joshua Haberman2016-02-16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed 'optional' from proto3 syntax file.
| | | | * | | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenGravatar Manjunath Kudlur2016-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --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 #1247 from thomasvl/xctool_plain_outputGravatar Thomas Van Lenten2016-02-16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 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" ↵Gravatar Thomas Van Lenten2016-02-16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | to get more readable logs on travis.
* | | | | | | Merge pull request #1245 from thomasvl/tweak_xctool_ios_runGravatar Thomas Van Lenten2016-02-16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 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 flakeGravatar Thomas Van Lenten2016-02-16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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_versionGravatar Thomas Van Lenten2016-02-16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bump up travis to Xcode 7.2
| * | | | | | | Bump up travis to Xcode 7.2Gravatar Thomas Van Lenten2016-02-16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update simulator versions used. - Mark the iOS tests as flaky while trying to dig out the root cause.
| | | * / / / Add more tests around merging wrappersGravatar Jon Skeet2016-02-15
| |_|/ / / / |/| | | | | | | | | | | | | | | | | This was in an attempt to fix the wrapper handling corner case, but it's really fiddly.
| | | | | * Validate that end-group tags match their corresponding start-group tagsGravatar Jon Skeet2016-02-15
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This detects: - An end-group tag with the wrong field number (doesn't match the start-group field) - An end-group tag with no preceding start-group tag Fixes issue #688.
| | | | * Generate C# code whenever descriptor.proto changesGravatar Jon Skeet2016-02-15
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 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 #1226 from jcanizales/patch-1Gravatar Paul Yang2016-02-12
|\ \ \ \ | | | | | | | | | | Include 'source' attribute in the podspec
* \ \ \ \ Merge pull request #1144 from dongjoon-hyun/remove_redundant_theGravatar Joshua Haberman2016-02-11
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove redundant `the`.
| * | | | Rewrap the lineGravatar Dongjoon Hyun2016-02-11
| | | | |
* | | | | Merge pull request #997 from anderscarling/better_errorsGravatar Joshua Haberman2016-02-11
|\ \ \ \ \ | | | | | | | | | | | | ruby: Better exception text for common cases
* \ \ \ \ \ Merge pull request #1178 from lebauce/fix-readme-typosGravatar Joshua Haberman2016-02-11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typos in README.md
* \ \ \ \ \ \ Merge pull request #1179 from ParthKolekar/python-examples-withGravatar Joshua Haberman2016-02-11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Updated python examples to use with.
* \ \ \ \ \ \ \ Merge pull request #1194 from Photonios/masterGravatar Joshua Haberman2016-02-11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed unused parameters and extra ';'
* \ \ \ \ \ \ \ \ Merge pull request #1217 from jhump/jh/make-warning-usefulGravatar Joshua Haberman2016-02-11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | make 'no syntax' warning useful by showing which file
* \ \ \ \ \ \ \ \ \ Merge pull request #1218 from jskeet/nuspec-dependenciesGravatar Jan Tattermusch2016-02-11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | nuspec dependency fixes
| | | | | | | | * | | Include 'source' attribute in the podspecGravatar Jorge Canizales2016-02-10
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | The new version of Cocoapods requires it even when using the podspec locally.
* | | | | | | | | | Merge pull request #1225 from google/nmakedocGravatar Joshua Haberman2016-02-10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Clarified that 'nmake' must be run before 'nmake check'.
| * | | | | | | | | | Clarified that 'nmake' must be run before 'nmake check'.Gravatar Josh Haberman2016-02-10
|/ / / / / / / / / /
| | | | | | | | * / Removed 'optional' from proto3 syntax file.Gravatar Josh Haberman2016-02-10
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge pull request #1185 from kkm000/icl-fixGravatar Joshua Haberman2016-02-10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Intel compiler warnings in include files on Windows
* \ \ \ \ \ \ \ \ \ Merge pull request #1220 from jtattermusch/add_strong_name_keyGravatar Jan Tattermusch2016-02-10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Check in strong name key.
| * | | | | | | | | | Add a linkGravatar Jan Tattermusch2016-02-10
| | | | | | | | | | |
| * | | | | | | | | | Use checked-in key to build ReleaseSignedGravatar Jan Tattermusch2016-02-09
| | | | | | | | | | |
| * | | | | | | | | | add private key for strong name assembliesGravatar Jan Tattermusch2016-02-09
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1214 from haberman/binarygemGravatar Joshua Haberman2016-02-08
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added support for binary gems.
| | | * | | | | | | | nuspec dependency fixesGravatar Jon Skeet2016-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly don't add any dependencies for "old" platforms, to avoid unnecessary dependencies in those cases. Fixes issue #1203.
| | | | * | | | | | | make 'no syntax' warning useful by showing which fileGravatar Joshua Humphries2016-02-06
| |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge pull request #1 from nicolasnoble/bin-gemsGravatar Joshua Haberman2016-02-05
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Few fixes.
| | * | | | | | | | | Actually enabling cross compilation.Gravatar Nicolas "Pixel" Noble2016-02-06
| | | | | | | | | | |
| | * | | | | | | | | Removing usage of git - not everyone grabs the gem using it.Gravatar Nicolas "Pixel" Noble2016-02-06
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1205 from haberman/fixjstestsGravatar Joshua Haberman2016-02-05
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Enable JavaScript tests for binary parse/serialize.
| | * | | | | | | | Add rake-compiler-dock as a dep.Gravatar Josh Haberman2016-02-04
| | | | | | | | | |
| | * | | | | | | | Added support for binary gems.Gravatar Josh Haberman2016-02-04
| |/ / / / / / / / |/| | | | | | | |