static gateway
Merge branch 'master' of https://github.com/mrmichalis/hadoop-cdh

Conflicts:
	linux/redhat/ks.cfg