Fangjin Yang 8323feedb4 Merge branch 'master' into moarunittests ... Conflicts: client/src/main/java/com/metamx/druid/http/BrokerMain.java		2012-11-08 10:37:05 -08:00
..
src	Merge branch 'master' into moarunittests	2012-11-08 10:37:05 -08:00
pom.xml	Cleaned Maven dependency configuration. In particular the 'mvn dependency:analyze' report no longer warns of used but undeclared dependencies.	2012-10-31 16:10:07 -07:00