aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update podspec version to 3.0.0-beta-2Jorge Canizales2016-01-151-1/+1
| | | It's already submitted.
* Merge pull request #1143 from xfxyjwf/fix_javaFeng Xiao2016-01-152-156/+158
|\ | | | | Fix tests broken by the Java directory change.
| * Fix tests broken by the Java directory change.Feng Xiao2016-01-142-156/+158
|/ | | | Change-Id: I39c4eadbd28164cfd83aa2d1d8b6dfe8286db803
* Merge pull request #1121 from nmittler/restructureFeng Xiao2016-01-13146-432/+516
|\ | | | | Restructuring protobuf to multiple modules
| * Restructuring protobuf to multiple modulesnmittler2016-01-13146-432/+516
| | | | | | | | | | | | | | | | | | protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings.
* | Merge pull request #1089 from jskeet/map-nullJan Tattermusch2016-01-1214-176/+168
|\ \ | | | | | | Prohibit null values in maps
| * | Prohibit null values in map fieldsJon Skeet2016-01-1114-176/+168
| | | | | | | | | | | | | | | On deserialization, missing values for message types are replaced with a "default" message.
* | | Merge pull request #1080 from haberman/conformance-crashesJoshua Haberman2016-01-1214-59/+861
|\ \ \ | | | | | | | | Allow conformance test runner to tolerate crashes, and re-enable conformance tests
| * | | Don't generate Objective C WKT for conformance tests to avoid dupliate defs.Josh Haberman2016-01-121-6/+11
| | | |
| * | | Conformance: Update C# failure list to reflect which tests currently pass.Josh Haberman2016-01-121-89/+2
| | | |
| * | | Fixed Ruby conformance tests by running them under rvm Ruby.Josh Haberman2016-01-113-5/+4
| | | |
| * | | Added debugging output to debug type= problem on Travis.Josh Haberman2016-01-112-2/+3
| | | |
| * | | Updated C#'s failure list, and added missing file.Josh Haberman2016-01-113-0/+179
| | | |
| * | | Allow conformance test runner to tolerate crashes, and re-enable conformance ↵Josh Haberman2016-01-1112-55/+760
| | | | | | | | | | | | | | | | tests.
* | | | Merge pull request #1129 from dongjoon-hyun/fix_typos_in_README_and_CHANGESFeng Xiao2016-01-125-17/+17
|\ \ \ \ | | | | | | | | | | Fix typos in README.md/CHANGES.txt
| * | | | Fix typos in README.md/CHANGES.txtDongjoon Hyun2016-01-115-17/+17
| |/ / /
* | | | Merge pull request #1131 from thomasvl/fix_sem_leakThomas Van Lenten2016-01-121-0/+1
|\ \ \ \ | |/ / / |/| | | Release the semaphore in dealloc, fixing leak.
| * | | Release the semaphore in dealloc, fixing leak.Thomas Van Lenten2016-01-121-0/+1
|/ / /
* | | Merge pull request #1046 from peternewman/patch-1Feng Xiao2016-01-111-2/+1
|\ \ \ | |/ / |/| | Add the docs claimed define for HAVE_UNORDERED_MAP
| * | Revert the change and remove an incorrect commentPeter Newman2016-01-091-5/+1
| | |
| * | Add the docs claimed define for HAVE_UNORDERED_MAPPeter Newman2015-12-151-0/+3
| | | | | | | | | Make the code match what the docs claimed, to return a define for HAVE_UNORDERED_MAP
* | | Merge pull request #1124 from xfxyjwf/appveyorFeng Xiao2016-01-091-1/+1
|\ \ \ | | | | | | | | Fix appveyor build.
| * | | Fix appveyor build.Feng Xiao2016-01-091-1/+1
|/ / /
* | | Merge pull request #1098 from jskeet/wkt-jsonJan Tattermusch2016-01-083-63/+55
|\ \ \ | | | | | | | | Ensure all formatted well-known-type values are valid JSON
| * | | Ensure all formatted well-known-type values are valid JSONJon Skeet2016-01-063-63/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves quoting timestamp/duration/field-mask values, even when they're not in fields. It's better for consistency. Fixes issue #1097.
* | | | Merge pull request #1088 from jskeet/codec-pruningJan Tattermusch2016-01-081-5/+0
|\ \ \ \ | | | | | | | | | | Remove unused method in FieldCodec.
| * | | | Remove unused method in FieldCodec.Jon Skeet2016-01-051-5/+0
| | | | | | | | | | | | | | | | | | | | (The method was last used a very long time ago, if ever.)
* | | | | Merge pull request #1087 from jskeet/json-testsJan Tattermusch2016-01-082-51/+91
|\ \ \ \ \ | | | | | | | | | | | | Improve number handling in JSON parsing
| * | | | | Improve number handling in JSON parsingJon Skeet2016-01-062-51/+91
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | - Tighten up on Infinity/NaN handling in terms of whitespace handling (and test casing) - Validate that values are genuinely integers when they've been parsed from a JSON number (ignoring the fact that 1.0000000000000000001 == 1 as a double...) - Allow exponents and decimal points in string representations
* | | | | Merge pull request #1120 from gitplaneta/masterFeng Xiao2016-01-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update README.md - remove typo
| * | | | | Update README.md - remove typoRadoslaw Busz2016-01-081-1/+1
|/ / / / /
* | | | | Merge pull request #1101 from xfxyjwf/docFeng Xiao2016-01-073-243/+30
|\ \ \ \ \ | |_|_|_|/ |/| | | | Update README.md and remove INSTALL.txt
| * | | | Update README.md and remove INSTALL.txtFeng Xiao2016-01-063-243/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added instructions on what tools to install to compile protobuf from source. Removed the INSTALL.txt file because it's just a simple copy of the autoconf documentation and confuses users. Change-Id: I6fd8aa13495f1238fe5c62451b95ad480b1c4bed
* | | | | Merge pull request #1118 from thomasvl/xcode_scheme_cleanupThomas Van Lenten2016-01-072-6/+6
|\ \ \ \ \ | |/ / / / |/| | | | Remove the stale reference to test no longer around, and keep the performance test limited to just performance tests.
| * | | | Remove the stale reference to test no longer around, and keep the ↵Thomas Van Lenten2016-01-072-6/+6
|/ / / / | | | | | | | | | | | | performance test limited to just performance tests.
* | | | Patch internal change 111557819.Feng Xiao2016-01-066-4/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Defer calls to mutable_unknown_fields() until it is actually required to save memory for C++ lite runtime. Change-Id: Ica9c1fd276cdb164942d1e7b6e098c83ee3ffdc5
* | | | Merge pull request #1100 from xfxyjwf/javadocFeng Xiao2016-01-063-6/+6
|\ \ \ \ | | | | | | | | | | Update version number and fix javadoc errors.
| * | | | Update version number and fix javadoc errors.Feng Xiao2016-01-063-6/+6
| | | | |
* | | | | Merge pull request #1094 from thomasvl/update_objc_conformanceThomas Van Lenten2016-01-063-108/+16
|\ \ \ \ \ | |_|/ / / |/| | | | Fix up the conformance tests
| * | | | Fix up the conformance testsThomas Van Lenten2016-01-053-108/+16
|/ / / / | | | | | | | | | | | | | | | | - Update all the new runner cases to handle a skip result as a skip and not a failure. - Make ObjC use the new serialize_error result if it fails to generate the data.
* | | | Merge pull request #1093 from thomasvl/fix_objcThomas Van Lenten2016-01-051-0/+13
|\ \ \ \ | | | | | | | | | | Update objectivec/google/protobuf/Type.pbobjc.m
| * | | | Update objectivec/google/protobuf/Type.pbobjc.mThomas Van Lenten2016-01-051-0/+13
|/ / / / | | | | | | | | | | | | | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have updated the generated .pbobjc.h but not the .pbobjc.m to match.
* | | | Merge pull request #1092 from thomasvl/fix_conformanceThomas Van Lenten2016-01-051-3/+0
|\ \ \ \ | | | | | | | | | | Fix conformance test to only report skips in verbose mode.
| * | | | Fix conformance test to only report skips in verbose mode.Thomas Van Lenten2016-01-051-3/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have mis-merged the change to reporting skipped tests. I didn't check if there were other merge issues.
* | | | Merge pull request #1091 from thomasvl/objc_tests_use_autocreatorsThomas Van Lenten2016-01-054-13/+1
|\ \ \ \ | | | | | | | | | | Have the tests rely on the autocreator behaviors.
| * | | | Have the tests rely on the autocreator behaviors.Thomas Van Lenten2016-01-054-13/+1
|/ / / / | | | | | | | | | | | | | | | | Incase developers look at the tests for examples, have them rely on the autocreators also.
* | | | Merge pull request #1085 from jskeet/fix-generationJon Skeet2016-01-052-125/+1301
|\ \ \ \ | | |/ / | |/| | Fix C# source generation shell script and remove out of date notes
| * | | Fix C# source generation shell script and remove out of date notesJon Skeet2016-01-042-125/+1301
|/ / / | | | | | | | | | | | | The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path. The notes around "fix-ups" have been out of date for some time now.
* | | Merge pull request #1081 from haberman/fix-py3Joshua Haberman2015-12-313-91/+152
|\ \ \ | |/ / |/| | Fixes for Python 3.
| * | Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-303-91/+152
|/ /