aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\
* \ Merge pull request #4030 from cyyber/masterGravatar Feng Xiao2017-12-20
|\ \
| | * Update version number to 3.5.1Gravatar Jisi Liu2017-12-19
| * | Calling Keychecker before checking key in MessageMapGravatar cyyber2017-12-15
* | | Fix python descriptor test.Gravatar Jisi Liu2017-12-14
|/ /
* | Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\ \
* | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| * | Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\|
| | * Update version for 3.5.0.post1Gravatar Jisi Liu2017-11-22
| | * Add _file_desc_by_toplevel_extension backGravatar Jie Luo2017-11-22
| | * Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
| |/ |/|
| * Fix a typo in WKT's test suiteGravatar Roman Nekhoroshev2017-11-02
|/
* Merge pull request #3770 from pherl/3.5-integrateGravatar Jisi Liu2017-10-19
|\
* \ Merge pull request #3736 from jleni/fix_rbpiGravatar Jisi Liu2017-10-18
|\ \
| | * Merge from google internalGravatar Jisi Liu2017-10-18
| |/ |/|
* | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\ \
| | * Converting to immutable hashable typesGravatar Juan Leni2017-10-11
| |/ |/|
| * Bump version for minor releaseGravatar Jisi Liu2017-09-14
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* | Merge pull request #2576 from cristicbz/py-strutilGravatar Feng Xiao2017-09-08
|\ \
* \ \ Merge pull request #3529 from pherl/merge3.4.xGravatar Jisi Liu2017-08-21
|\ \ \
* | | | remove the parens from the cmp() lambda definition (#3526)Gravatar cclauss2017-08-21
| * | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterGravatar Jisi Liu2017-08-18
|/| | | | | |/ | |/|
* | | Define cmp() for Python 3 (#3517)Gravatar cclauss2017-08-18
* | | define long() for Python 3Gravatar cclauss2017-08-18
* | | PY26 tests compatibilityGravatar Jie Luo2017-08-04
* | | Skip setUpClass which is newly added in python2.7 for python2.6Gravatar Jie Luo2017-08-04
| * | Merge from masterGravatar Jisi Liu2017-07-25
| * | Merge remote-tracking branch 'origin/3.4.x' into vbGravatar Jisi Liu2017-07-24
| |\ \
| | * | Add __bool__ as well as __nonzero__ for python3Gravatar Jie Luo2017-07-24
| * | | Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
| | * | Use keys() instead of iterkeys() to be python3 compatbile.Gravatar Jie Luo2017-07-24
| |/ /
* | | Merge pull request #3179 from bjwatson/fix-duration-typoGravatar Feng Xiao2017-07-20
|\ \ \
* \ \ \ Merge pull request #3262 from snnn/masterGravatar Jie Luo2017-07-19
|\ \ \ \
| | | * | Fix code to use values() insteadGravatar Jisi Liu2017-07-19
| | | * | Use itmes() instead of itervalues() to be python3 compatbile.Gravatar Jisi Liu2017-07-19
| | | * | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| * | | | Fix a bazel build error on WindowsGravatar Changming Sun2017-06-22
| | |/ / | |/| |
| | * | Fix typos in commentGravatar Brian J. Watson2017-06-21
| |/ /
* | | Update version number to 3.3.2Gravatar Bo Yang2017-06-21
* | | Update version number to 3.3.1Gravatar Feng Xiao2017-05-08
|/ /
* | Fix python3 issue.Gravatar Feng Xiao2017-04-20
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Gravatar Jie Luo2017-04-10
* | Update version number and changelog for 3.3.0Gravatar Feng Xiao2017-04-05
* | Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* | Merge pull request #2613 from aausch/fix_memory_leakGravatar Jisi Liu2017-03-06
|\ \
* | | Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| * | cache generated classes, optimization and quick workaround to memory leakGravatar Alex Ausch2017-01-30
|/ /
| * python: do not include internal 'strutil.h' headerGravatar Cristi Cobzarenco2017-01-28
|/
* A few more cases for binary conformance tests. (#2500)Gravatar Joshua Haberman2017-01-06