seven commit
other commit
Merge branch 'master' of https://github.com/meimeic/hadoop-final