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

..

bin

Merge branch 'master' into new-schema

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

cassandra

first set of changes to standarize the naming convention we use in druid

2013-10-03 16:36:48 -07:00

config

fix another breaking endpoint in druid coordinator

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

src

unit tests passingn at this point, finished rt port maybe

2014-02-18 15:14:38 -08:00

pom.xml

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

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