Merge branch 'batch-zk' into worker-resource
Merge branch 'master' into worker-resource

Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
fix up configs
Merge branch 'master' into worker-resource

Conflicts:
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
Merge branch 'batch-zk' into worker-resource

Conflicts:
	pom.xml
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
Merge branch 'bug-fix' into worker-resource
Building a correct segment path for HDFS
moved getHdfsStorageDir() to DataSegmentPusherUtil, extended test
Merge branch 'master' of github.com:metamx/druid
Merge branch 'batch-zk' into worker-resource
correct segment path for hadoop indexer
Merge branch 'master' into worker-resource
Merge branch 'master' into worker-resource
1) remove retry logic from RTR
2) simplify configs
3) introduce task resource
4) make worker versions match coordinator version by default
Merge branch 'master' into worker-resource
compression for batch-zk
code review fixes
add read to batch zk
rename to fix case issue
Merge branch 'master' into batch-zk

Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java