4 Commits

Author SHA1 Message Date
fjy
42cc87a294 Merge branch 'master' into refactor-indexing
Conflicts:
	indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexTask.java
	pom.xml
2013-05-31 17:28:59 -07:00
fjy
c6ad0753f0 bug fixes 2013-05-16 16:02:20 -07:00
fjy
6213c0b63c Merge branch 'master' into refactor-indexing 2013-05-15 17:14:40 -07:00
fjy
20ae1d8b6b lots of cleanups and refactorings 2013-05-15 15:37:04 -07:00