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

Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java

2014-01-20 15:10:13 -08:00

..

src

Merge branch 'master' into az

2014-01-20 15:10:13 -08:00

pom.xml

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

2014-01-17 15:53:54 -08:00