aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1894 from pherl/fixdistJisi Liu2016-07-291-0/+1
|\ | | | | Add python/setup.cfg into dist files
| * Add python/setup.cfg into dist filesJisi Liu2016-07-291-0/+1
|/
* Merge pull request #1892 from xfxyjwf/compatibility_testsJisi Liu2016-07-292-0/+13
|\ | | | | Run Java compatibility tests on Travis.
| * Run Java compatibility tests on Travis.Feng Xiao2016-07-292-0/+13
| | | | | | | | | | | | | | The test is testing the binary/source compatibility between 3.0.0-beta-4 and the current version (right now it's 3.0.0). Change-Id: Ic410b535758b38cee7baa99a15a0433734df44e6
* | Merge pull request #1891 from pherl/pythonJisi Liu2016-07-291-0/+2
|\ \ | |/ |/| add setup.cfg for building wheels
| * add setup.cfg for building wheelsJisi Liu2016-07-291-0/+2
| |
* | Merge pull request #1888 from pherl/fixbuildzipJisi Liu2016-07-291-2/+8
|\ \ | |/ |/| Fix the build-zip.sh to add .exe for win packages.
| * Fix the build-zip.sh to add .exe for win packages.Jisi Liu2016-07-291-2/+8
|/
* Merge pull request #1874 from pherl/buildzipJisi Liu2016-07-282-19/+31
|\ | | | | Change the build.zip.sh to support lite
| * Change the build.zip.sh to support liteJisi Liu2016-07-282-19/+31
| |
* | Merge pull request #1871 from pherl/fixwinJisi Liu2016-07-281-5/+3
|\ \ | |/ |/| Fix build protoc script for windows
| * Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
|/
* Merge pull request #1864 from pherl/galogsv3.0.0Jisi Liu2016-07-271-0/+51
|\ | | | | Change log for 3.0 GA release.
| * Change log for 3.0 GA release.Jisi Liu2016-07-271-0/+51
|/
* Merge pull request #1853 from pherl/3.0.0-GAJisi Liu2016-07-262-8/+22
|\ | | | | Make protoc-artifacts able to build plugins.
| * fix comments.Jisi Liu2016-07-261-1/+1
| |
| * Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GAJisi Liu2016-07-264-14/+23
| |\ | |/ |/|
* | Merge pull request #1851 from xfxyjwf/cintFeng Xiao2016-07-262-5/+5
|\ \ | | | | | | Fixes traivs cpp build.
| * | Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
|/ / | | | | | | Remove the use of INT64_C/UINT64_C and add static_cast when neccessary.
* | 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 #1841 from pherl/3.0.0-GAJisi Liu2016-07-2613-13/+13
|\ \ \ \ | |/ / / |/| | | Bump version number for GA
* | | | 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
| | | * Fix the script comments.Jisi Liu2016-07-261-2/+2
| | | |
| | | * Make protoc-artifacts able to build plugin.Jisi Liu2016-07-262-8/+22
| | | |
| | | * Merge branch 'master' of github.com:google/protobuf into 3.0.0-GAJisi Liu2016-07-2611-17/+181
| | |/| | |/|/
| | * 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.
| * | 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
|/ /
* | 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.