diff options
author | Jie Luo <anandolee@gmail.com> | 2015-10-20 11:28:48 -0700 |
---|---|---|
committer | Jie Luo <anandolee@gmail.com> | 2015-10-20 11:28:48 -0700 |
commit | 32fb7dda587cbda4e9811bd1daad4fda324c606d (patch) | |
tree | f63d78923836a516ec8075bc7a85e58d2f6c2283 /travis.sh | |
parent | e63bd9be269498c5baed0eb8771e2152436774f7 (diff) | |
parent | 2850a98275b1397c511973e207a16ea704ffb18f (diff) | |
download | protobuf-32fb7dda587cbda4e9811bd1daad4fda324c606d.tar.gz protobuf-32fb7dda587cbda4e9811bd1daad4fda324c606d.tar.bz2 protobuf-32fb7dda587cbda4e9811bd1daad4fda324c606d.zip |
Merge pull request #869 from anandolee/master
fix json_format for python2.6:
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -131,8 +131,7 @@ build_python() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - # py26 is currently disabled due to json_format - envlist=py\{27,33,34\}-python + envlist=py\{26,27,33,34\}-python else envlist=py27-python fi |