dfd
Merge branch 'master' of https://github.com/Bellonor/myhadoop2.x.git