fjy c7b4d5b7b4 Merge branch 'master' into druid-0.7.x ... Conflicts: processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java		2014-10-02 18:12:10 -07:00
..
src	Merge branch 'master' into druid-0.7.x	2014-10-02 18:12:10 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-09-23 16:31:25 -07:00