change default merge size to 500mb instead of 1g
Merge branch 'master' of github.com:metamx/druid