fjy b6fb4245aa Merge branch 'master' into new-schema ...

Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDriverConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfigBuilder.java
	pom.xml
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java

2014-05-06 14:32:51 -07:00

..

bin

Merge branch 'master' into new-schema

2014-05-06 14:32:51 -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

update docs for next rel

2014-05-01 15:07:14 -07:00

src

Merge branch 'master' into new-schema

2014-04-25 14:03:28 -07:00

pom.xml

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

2014-05-06 11:28:39 -07:00