Merge branch 'master' of https://github.com/wfh45678/hadoop.git
Merge branch 'master' of https://github.com/wfh45678/hadoop.git