update
Merge branch 'v2-tach' of https://github.com/haoyuan/spark-ec2 into v2-tach
merge upstream