Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'github/alpha-2-fix' | Jisi Liu | 2015-03-04 | 1 | -1/+1 |
|\ | | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e | ||||
| * | Fix python package version to alpha-2. | Jisi Liu | 2015-03-04 | 1 | -1/+1 |
| | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf | ||||
* | | Merge pull request #225 from google/post-alpha2-integrate | Jisi Liu | 2015-03-03 | 6 | -15/+22 |
|\ \ | | | | | | | Post alpha2 integrate from google internal for C++ and Java | ||||
| * | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 6 | -15/+22 |
| |/ | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* / | Bump the version number to 3.0.0-alpha-3-pre | Jisi Liu | 2015-03-02 | 1 | -1/+1 |
|/ | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e | ||||
* | Fixes for Python/C++ implementation in open-source: | Josh Haberman | 2015-02-25 | 9 | -23/+484 |
| | | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner. | ||||
* | Down integrate from Google internal. | Jisi Liu | 2015-02-25 | 36 | -2077/+5690 |
| | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | ||||
* | Update version number to 3.0.0-alpha-2 | Jisi Liu | 2015-02-21 | 1 | -1/+1 |
| | | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2 | ||||
* | Delete unused files. | Feng Xiao | 2015-01-27 | 1 | -27/+0 |
| | |||||
* | Merge pull request #143 from Ivoz/patch-1 | Feng Xiao | 2014-12-22 | 1 | -2/+2 |
|\ | | | | | Update python version / setuptools instructions | ||||
| * | Update python version / setuptools instructions | Matt Iversen | 2014-12-17 | 1 | -2/+2 |
| | | | | | | | | | | Reflect the change that protobuf should now only be supporting 2.6+ (I'd guess note python 3.x+ when its supported in implementation) Refer to the Python Packaging User Guide for installing setuptools (and pip) instead of out of date telecommunity guide. | ||||
* | | Merge pull request #46 from adalq/version | Feng Xiao | 2014-12-20 | 1 | -0/+35 |
|\ \ | |/ |/| | Add __version__ | ||||
| * | Updated __version__ | Adal Chiriliuc | 2014-12-14 | 1 | -1/+1 |
| | | |||||
| * | Add __version__ | Adal Chiriliuc | 2014-10-10 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__" | ||||
| * | Revert "Add __version__" | Adal Chiriliuc | 2014-10-10 | 2 | -35/+0 |
| | | | | | | | | This reverts commit 5337cf564f5eb43c1975d1cfd87b4efba9e6bf35. | ||||
| * | Add __version__ | Adal Chiriliuc | 2014-10-10 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__" | ||||
* | | Update version number to v3.0.0-pre | Feng Xiao | 2014-12-10 | 1 | -1/+1 |
| | | |||||
* | | Update version number to v3.0.0-alpha-1 | Feng Xiao | 2014-12-03 | 1 | -1/+1 |
| | | |||||
* | | Fix Python C++ implementation build issues: | Feng Xiao | 2014-11-25 | 2 | -5/+9 |
| | | | | | | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword. | ||||
* | | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | 1 | -1/+1 |
| | | |||||
* | | Down-integrate from internal code base (C++ maps support). | Feng Xiao | 2014-11-14 | 3 | -24/+20 |
| | | |||||
* | | Merge branch 'typofixes-vlajos-20141108' of ↵ | Feng Xiao | 2014-11-11 | 6 | -6/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc | ||||
| * | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-08 | 6 | -6/+6 |
| | | | |||||
* | | | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | 45 | -594/+1223 |
|/ / | |||||
* | | Merge pull request #50 from dlitz/compat-py3k | Feng Xiao | 2014-11-08 | 1 | -2/+11 |
|\ \ | | | | | | | setup.py fixes for Python 3 | ||||
| * | | Omit google-apputils dependency under Python 3 | Dwayne Litzenberger | 2014-10-14 | 1 | -1/+5 |
| | | | | | | | | | | | | Temporary change until a py3k-compatible google-apputils is released. | ||||
| * | | Use 2to3 when building under Python 3. | Dwayne Litzenberger | 2014-10-14 | 1 | -1/+6 |
| | | | |||||
* | | | Update version number to 2.6.2-pre. | Feng Xiao | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
* | | | Update version number to 2.6.1.v2.6.1 | Feng Xiao | 2014-10-20 | 1 | -1/+1 |
|/ / | |||||
* / | Update version number to 2.6.1rc1 | Feng Xiao | 2014-10-08 | 1 | -1/+1 |
|/ | |||||
* | Down-integrate from internal branch. | Feng Xiao | 2014-10-07 | 4 | -6/+22 |
| | |||||
* | Merge pull request #3 from dhirschfeld/pyext-fix | Feng Xiao | 2014-10-02 | 1 | -0/+1 |
|\ | | | | | Explicitly specify pyext/cpp_message.py in py_modules list | ||||
| * | Explicitly specify pyext/cpp_message.py in py_modules list | David Hirschfeld | 2014-08-27 | 1 | -0/+1 |
| | | |||||
* | | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 69 | -70/+70 |
|/ | | | | developers.google.com/protocol-buffers | ||||
* | merge 2.6.0 to trunkv2.6.0 | jieluo@google.com | 2014-08-25 | 2 | -8/+5 |
| | |||||
* | merge tags/2.6.0 into trunk | jieluo@google.com | 2014-08-25 | 4 | -41/+33 |
| | |||||
* | make dist complains the file name is too long and refuse to put it to tar. ↵ | jieluo@google.com | 2014-08-14 | 1 | -1/+1 |
| | | | | Change the file to a shorter name | ||||
* | Add deleted tests back for reflection_cpp2_test.py by addtional exception catch | jieluo@google.com | 2014-08-14 | 1 | -0/+47 |
| | |||||
* | change python README.txt | jieluo@google.com | 2014-08-13 | 1 | -3/+8 |
| | |||||
* | put python cpp tests into pyext/ | jieluo@google.com | 2014-08-13 | 5 | -34/+9 |
| | |||||
* | add shared_pr.h | jieluo@google.com | 2014-08-12 | 2 | -9/+10 |
| | |||||
* | down integrate python opensource to svn | jieluo@google.com | 2014-08-12 | 62 | -962/+9928 |
| | |||||
* | down integrate to svn | jieluo@google.com | 2014-07-18 | 6 | -2262/+37 |
| | |||||
* | Update version number in trunk | xiaofeng@google.com | 2013-02-28 | 1 | -2/+1 |
| | |||||
* | Exclude a failing test in MingW build. | xiaofeng@google.com | 2013-02-26 | 1 | -1/+2 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2013-02-25 | 2 | -2/+27 |
| | |||||
* | Fix issue 438: add missing 'enum_type_wrapper' to setup.py | xiaofeng@google.com | 2012-12-08 | 1 | -0/+1 |
| | |||||
* | Find the protoc from environ first for python. | liujisi@google.com | 2012-12-05 | 1 | -1/+3 |
| | |||||
* | Fix issues: 342, 424, 428, 430, 436 | xiaofeng@google.com | 2012-12-04 | 1 | -6/+0 |
| | |||||
* | Update version to 2.5.0-pre | liujisi@google.com | 2012-11-30 | 1 | -1/+1 |
| |