aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1847 from haberman/GAfixesJoshua Haberman2016-07-2612-18/+182
|\ | | | | GA fixes
| * Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-261-1/+1
| |
| * Merge branch 'master' into 3.0.0-GAJosh Haberman2016-07-2511-17/+181
| |\ | | | | | | | | | We need to pick up some of the last-minute Ruby fixes.
| | * Merge pull request #1788 from google/rubypackagecapJoshua Haberman2016-07-256-7/+58
| | |\ | | | | | | | | Ruby: translate package names from snake_case -> PascalCase.
| | | * Added new file to ruby_EXTRA_DIST.Josh Haberman2016-07-251-0/+1
| | | |
| | | * Added unit test for PascalCasing package names in Ruby.Josh Haberman2016-07-254-1/+13
| | | |
| | | * Ruby: translate package names from snake_case -> PascalCase.Josh Haberman2016-07-251-6/+44
| | | |
| | * | Merge pull request #1846 from xfxyjwf/zipFeng Xiao2016-07-252-0/+113
| | |\ \ | | | |/ | | |/| Add a script to build protoc zip packages.
| | | * Add a script to build protoc zip packages.Feng Xiao2016-07-252-0/+113
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Change-Id: Ia0e0bf3bb6bd24633dc8f294318bb20ac837f8b9
| | * | Merge pull request #1837 from haberman/rubygencodenameJoshua Haberman2016-07-256-10/+10
| | |\ \ | | | |/ | | |/| Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.
| | | * Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.Josh Haberman2016-07-256-10/+10
| | | | | | | | | | | | | | | | | | | | This brings us more into line with other langauges, and makes it more obvious when we are requiring protobuf generated code.
* | | | Merge pull request #1841 from pherl/3.0.0-GAJisi Liu2016-07-2613-13/+13
|\ \ \ \ | |/ / / |/| | | Bump version number for GA
| * | | remove extra zeros.Jisi Liu2016-07-251-1/+1
| | | |
| * | | Make jruby still depend on beta-4Jisi Liu2016-07-251-1/+1
| | | |
| * | | Bump version number for GAJisi Liu2016-07-2513-13/+13
| |/ /
* / / Define intX as standard exact-width integer types.Feng Xiao2016-07-252-12/+21
|/ / | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/823 Change-Id: I7f4c2bfcac2f81d8b34c030dd3d12ea02aaa2264
* | Merge pull request #1831 from xfxyjwf/protocFeng Xiao2016-07-251-2/+2
|\ \ | | | | | | Fix maven links.
| * | Fix maven path.Feng Xiao2016-07-231-1/+1
| | | | | | | | | | | | Change-Id: I252d7a644a9e4064a9f1a816a2be3f25f37b4c43
| * | Fix maven links.Feng Xiao2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | [ci skip] Change-Id: Ibefbdf441d932c5751235c635244450d7cbacc53
* | | Merge pull request #1834 from sergiocampama/frameworkFeng Xiao2016-07-251-8/+17
|\ \ \ | | | | | | | | Correctly sets the generate_for_named_framework option after parsing.
| * | | Correctly sets the generate_for_named_framework option after parsing.Sergio Campama2016-07-231-8/+17
| | |/ | |/| | | | | | | - Also updates the documentation with a bit more information.
* | | Merge pull request #1821 from haberman/rubyfreezestrJoshua Haberman2016-07-2511-83/+132
|\ \ \ | |/ / |/| | Ruby: encode and freeze strings when the are assigned or decoded.
| * | Ruby: fixed string freezing for JRuby.Josh Haberman2016-07-255-25/+30
| | |
| * | Ruby: encode and freeze strings when the are assigned or decoded.Josh Haberman2016-07-217-60/+104
| | |
* | | Merge pull request #1830 from xfxyjwf/travisFeng Xiao2016-07-231-14/+7
|\ \ \ | | | | | | | | Remove linux tests from travis.
| * | | Keep cpp_distcheck on travis for now.Feng Xiao2016-07-222-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it runs in parallel with other jenkins tests, multiple tests start to fail probably because cpp_distcheck will update the C++ lib that other tests (such as python_cpp) are depending on. Change-Id: Ibca0243084bb6b81c811b62c75288e20cc2aabf5
| * | | Remove linux tests from travis.Feng Xiao2016-07-222-11/+1
| | |/ | |/| | | | | | | | | | | | | | | | These tests are already covered by jenkins and right now jenkins can finish these tests much quicker then travis. Change-Id: I5799761ccc338211d750940e3cf4c8e2569c8144
* | | Merge pull request #1829 from xfxyjwf/fixcppFeng Xiao2016-07-234-349/+34
|\ \ \ | |/ / |/| | Fix sign-comparison warnings and add a test for that.
| * | Fix sign-comparison warnings in public header files.Feng Xiao2016-07-222-6/+6
| | |
| * | Add a test to catch sign-comparison warnings.Feng Xiao2016-07-222-343/+28
| | | | | | | | | | | | | | | | | | | | | | | | grpc build treates them as errors and such issues (protobuf change breaks grpc) has been reported repeatedly. For example: https://github.com/google/protobuf/issues/1813 Change-Id: I077c4557cf3effd5195f88802c38999b884edc30
* | | Merge pull request #1825 from xfxyjwf/jenkins2Feng Xiao2016-07-225-23/+39
|\ \ \ | | | | | | | | Add more tests to jenkins.
| * | | Add more tests to jenkins.Feng Xiao2016-07-215-23/+39
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Added ruby22 and jruby tests to jenkins. 2. Added javascript tests to jenkins. 3. Added golang tests to jenkins. 4. Removed ruby19/ruby20 tests from travis. Support for ruby 2.0 has ended since 2016/02/24. https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/ Change-Id: Ie984b06772335352a4be7067ab2485f923875685
* | | Merge pull request #1828 from sergiocampama/frameworkFeng Xiao2016-07-222-2/+3
|\ \ \ | |/ / |/| | Fixes the parsing of the proto-framework map file.
| * | Fixes the parsing of the proto-framework map file.Sergio Campama2016-07-222-2/+3
|/ / | | | | | | | | - Fixes memory issue where the pointer to the StringPiece would be allocated on the stack, and would mangle the output. - Fixes length of the file name when parsing the comma separated files.
* | Merge pull request #1822 from xfxyjwf/java6Feng Xiao2016-07-212-20/+3
|\ \ | |/ |/| Update travis tests for Java.
| * Update travis tests for Java.Feng Xiao2016-07-212-20/+3
|/ | | | | | | | | | | | 1. Set JAVA_HOME so mvn can pick up the correct java version. 2. Remove jdk6 tests. It has been broken for a while and remain undetected as mvn is actually using java 7 to build the code. Given that we have set -source and -target to 6 in the pom.xml and the built .jar should be usable by java 6, having a dedicated java 6 test doesn't seem necessary (assuming very few Java 6 users want to compile protobuf Java from source). Change-Id: I4f14da772632df3e47801f180198242b306c3f0f
* Merge pull request #1811 from xfxyjwf/fixdistFeng Xiao2016-07-202-0/+26
|\ | | | | Add missing files in EXTRA_DIST and add a test.
| * Add missing files in EXTRA_DIST and add a test.Feng Xiao2016-07-202-0/+26
|/ | | | Change-Id: If80725402173cdf50969cb08e7fe5affe3532fb2
* Merge pull request #1810 from xfxyjwf/versioningFeng Xiao2016-07-2013-768/+2879
|\ | | | | Versioning Java GeneratedMessage class
| * Add files missing from "make dist".Feng Xiao2016-07-192-36/+96
| | | | | | | | Change-Id: I56a6cce613462794f172ff2e62b25d8a9fc162f3
| * Update compatibility tests as well.Feng Xiao2016-07-193-347/+8
| | | | | | | | Change-Id: I991396ac6e51e32f3ab1daa501d625f34c3ecb04
| * Versioning Java GeneratedMessage.Feng Xiao2016-07-198-385/+2775
| | | | | | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
* | Merge pull request #1812 from jskeet/fix-travisJon Skeet2016-07-201-1/+1
|\ \ | | | | | | Use the dotnet-release package feed for Travis.
| * | Use the dotnet-release package feed for Travis.Jon Skeet2016-07-191-1/+1
| |/ | | | | | | See https://github.com/dotnet/core/issues/227 for background.
* | Merge pull request #1447 from seishun/defaultsJoshua Haberman2016-07-204-73/+80
|\ \ | |/ |/| JavaScript: Make implicit defaults consistent with explicit defaults
| * fix debug.dumpNikolai Vavilov2016-07-201-2/+4
| |
| * restore old behavior for toObjectNikolai Vavilov2016-07-192-13/+37
| |
| * nitsNikolai Vavilov2016-07-191-32/+21
| |
| * Make implicit defaults consistent with explicit defaultsNikolai Vavilov2016-07-193-96/+88
|/
* Merge pull request #1802 from haberman/jsmapbinJoshua Haberman2016-07-184-131/+151
|\ | | | | JavaScript: segregate references to binary functionality
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 00:04:32 +0000