fjy f123a14373 Merge branch 'master' into az ...

Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java

2014-01-09 19:09:38 -08:00

..

src

Merge branch 'master' into az

2014-01-09 19:09:38 -08:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2014-01-02 19:53:41 -08:00