merge fix
Merge branch 'master' of https://github.com/hairyhum/cluster_farm into HEAD
Merge branch 'master' of https://github.com/hairyhum/cluster_farm into HEAD
new conf
save commit
add hz