Fixed maven build when druid is integrated as a submodule
fix broken standalone hadoop ingestion
Merge pull request #580 from metamx/fix-hadoop

fix broken standalone hadoop ingestion
prepare for next release
[maven-release-plugin] prepare release druid-0.6.117
[maven-release-plugin] prepare for next development iteration
update performance FAQ
fix typos
fix link to docs
make combine text configurable
fix test
Merge pull request #581 from metamx/combine-text

Make combine text input format configurable
prepare for next release
[maven-release-plugin] prepare release druid-0.6.118
[maven-release-plugin] prepare for next development iteration
IndexGeneratorJob needs to respect isCombineText, too.
[maven-release-plugin] prepare release druid-0.6.119
[maven-release-plugin] prepare for next development iteration
prepare for next rel
[maven-release-plugin] prepare release druid-0.6.120