Merge pull request #3454 from anandolee/master

Add python 2.6 test back for cpp implementation. 

1 files changed, 1 insertions, 2 deletions

diff --git a/tests.sh b/tests.sh
index cfc08c35..f68de059 100755
--- a/tests.sh
+++ b/tests.sh
@@ -294,8 +294,7 @@ build_python_cpp() {
   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\}-cpp
+    envlist=py\{26,27,33,34\}-cpp
   else
     envlist=py27-cpp
   fi