3 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	08d84001ba	Merge branch 'master' into refactor-indexing	2013-05-16 16:03:29 -07:00
fjy	26e0eb62cb	merge and other refactorings	2013-05-15 17:28:08 -07:00