fjy 09ad32c5c5 fix race condition with merge and persist and sink adding ... Conflicts: indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java server/src/main/java/io/druid/segment/realtime/RealtimeManager.java server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java		2014-05-16 15:21:09 -07:00
..
src	fix race condition with merge and persist and sink adding	2014-05-16 15:21:09 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-05-15 16:44:36 -07:00