fjy 2adcf07f5f Merge branch 'master' into new-schema ...

Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java

2014-03-17 10:59:31 -07:00

..

src

Merge branch 'master' into new-schema

2014-03-03 14:48:15 -08:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2014-03-14 15:16:55 -07:00