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

do not deploy layout

2013-11-07 13:40:54 -08:00

_graphics

svg versions of druid architecture diagrams

2013-11-12 13:42:39 -08:00

_includes

a ton of fixes to docs

2013-10-10 15:05:01 -07:00

_layouts

Finish converting docs over to something that displays properly

2013-09-27 19:08:34 -05:00

content

Merge branch 'master' into new-schema

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

css

Make more of the docs look and work correctly. Yay! Almost done with this!

2013-09-27 12:57:08 -05:00

img

updated version of realtime segment propagation

2013-11-27 11:48:21 -08:00

_config.yml

Docs working

2013-09-26 18:22:28 -05:00

index.html

fix broken link when testing locally

2013-11-05 15:51:34 -08:00