aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' of github.com:google/protobufJosh Haberman2015-02-1754-461/+23717
| |\ \ | |/ / |/| |
* | | Merge pull request #204 from pherl/masterJisi Liu2015-02-1715-87/+1163
|\ \ \ | | |/ | |/|
| * | Mark factory setter API as private for alpha release.Jisi Liu2015-02-171-1/+5
| * | Merge the javanano map test into the main test target.Jisi Liu2015-02-091-4/+0
| * | Add java compiled targets and several tests target into .gitignore.Jisi Liu2015-02-091-0/+11
| * | Get the map factory per mergeFrom() call for JavaNano.Jisi Liu2015-02-075-2/+23
| * | implement hashCode() for JavaNano maps.Jisi Liu2015-02-062-0/+22
| * | Implement Equals for nano.Jisi Liu2015-02-063-2/+166
| * | Rename empty bytes in JavaNano.Jisi Liu2015-02-052-4/+3
| * | Rename readData() to readPrimitiveField() in JavaNano.Jisi Liu2015-02-053-4/+4
| * | Add tests merging empty entries in JavaNano mapJisi Liu2015-02-051-0/+30
| * | Fix the behavior when merging conflicting keys, the new value alwaysJisi Liu2015-02-054-37/+38
| * | Test keys and values cannot be null.Jisi Liu2015-02-051-1/+23
| * | Basic serialization/parsing test.Jisi Liu2015-02-052-1/+130
| * | Moving internal code to InternalNano and rename MapUtil to MapFactories.Jisi Liu2015-02-044-237/+233
| * | parsing and serialzation for maps in JavaNano.Jisi Liu2015-02-034-55/+316
| * | Parsing for Maps in JavaNanoJisi Liu2015-02-023-16/+190
| * | Add readData(int) to read primitive value.Jisi Liu2015-02-021-0/+40
| * | MOVE TYPE_XXX constants to InternalNano.Jisi Liu2015-02-022-54/+39
| * | Use map generator for maps field; skip entry message.Jisi Liu2015-02-022-1/+9
| * | Add package for map test for nano.Jisi Liu2015-02-022-1/+8
| * | Add tests for JavaNano maps.Jisi Liu2015-02-022-0/+53
| * | Initial checkin for maps support in JavaNano.Jisi Liu2015-01-304-10/+174
* | | Merge pull request #211 from isaiah/map_inspectChris Fallin2015-02-172-2/+2
|\ \ \
| * | | Google::Protobuf::Map#inspect should be consistent with Hash#inspectIsaiah Peng2015-02-142-2/+2
* | | | Merge pull request #209 from cfallin/ruby-protoc-mapsJoshua Haberman2015-02-133-89/+83
|\ \ \ \
| * | | | Addressed code-review comment.Chris Fallin2015-02-131-0/+4
| * | | | Properly support maps in Ruby protoc and another bugfix.Chris Fallin2015-02-123-89/+79
|/ / / /
* | | | Merge pull request #201 from gordana-cmiljanovic-imgtec/mips-atomic-ops-fixFeng Xiao2015-02-121-2/+2
|\ \ \ \
| * | | | MIPS: remove immediate constraint within CompareAndSwap.Gordana Cmiljanovic2015-02-091-2/+2
* | | | | Merge pull request #203 from pherl/gitignoreChris Fallin2015-02-091-0/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add java compiled targets and several tests target into .gitignore.Jisi Liu2015-02-091-0/+11
| | |/ / | |/| |
* | | | Merge pull request #197 from nsuke/protoc-export-rubyChris Fallin2015-02-071-1/+2
|\ \ \ \
| * | | | Add missing LIBPROTOC_EXPORT to ruby generatorNobuaki Sukegawa2015-02-081-1/+2
|/ / / /
* | | | Merge pull request #189 from cfallin/update-ruby-upbJoshua Haberman2015-02-054-111/+565
|\ \ \ \ | |_|/ / |/| | |
| * | | README.md update for Ruby gem.Chris Fallin2015-02-051-7/+5
| * | | Updated to latest upb and added test for JSON map operation.Chris Fallin2015-02-023-104/+560
* | | | Merge pull request #190 from isaiah/to_aryChris Fallin2015-02-032-32/+30
|\ \ \ \
| * | | | add #to_ary to RepeatedFieldIsaiah Peng2015-02-032-32/+30
* | | | | Merge pull request #186 from ennerf/win32-msvc-fixFeng Xiao2015-02-022-2/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | removed accidental whitespaceFlorian Enner2015-02-021-1/+1
| * | | | replaced type fix with the recommended wayFlorian Enner2015-01-311-8/+2
| * | | | fixed MSVC compile errorFlorian Enner2015-01-311-0/+6
| * | | | added missing ruby generator to msvc projectFlorian Enner2015-01-311-0/+8
| |/ / /
* | | | Merge pull request #168 from cfallin/ruby-oneofJoshua Haberman2015-02-0217-262/+2348
|\ \ \ \ | |/ / / |/| | |
| * | | Updated based on code-review comments.Chris Fallin2015-02-021-2/+1
| * | | Updated based on code-review comments.Chris Fallin2015-02-023-16/+51
| * | | Addressed code-review comments.Chris Fallin2015-01-262-12/+26
| * | | Addressed code-review comments.Chris Fallin2015-01-263-7/+12
| * | | Ruby extension: added oneof accessor.Chris Fallin2015-01-143-1/+53
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 05:17:30 +0000