[1/2] spark git commit: [SPARK-7899] [PYSPARK] Fix Python 3 pyspark/sql/types module conflict
Repository: spark Updated Branches: refs/heads/branch-1.4 4cafc6352 - a76c2e128 http://git-wip-us.apache.org/repos/asf/spark/blob/a76c2e12/python/pyspark/sql/types.py -- diff --git a/python/pyspark/sql/types.py
[1/2] spark git commit: [SPARK-7899] [PYSPARK] Fix Python 3 pyspark/sql/types module conflict
Repository: spark Updated Branches: refs/heads/master 5f48e5c33 - 1c5b19827 http://git-wip-us.apache.org/repos/asf/spark/blob/1c5b1982/python/pyspark/sql/types.py -- diff --git a/python/pyspark/sql/types.py