test rebase
test
Merge branch 'feature/testflow' of https://github.com/deepsihag/hadoop-pseudo-mode-yum into feature/testflow

Conflicts:
	metadata.rb