fjy 2969d9a713 Merge branch 'master' into batch-zk
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
2013-06-27 16:46:37 -07:00
..
2013-06-27 16:46:37 -07:00