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

..

css

…

About-Experimental-Features.md

…

Aggregations.md

cosmetic changes

2014-04-25 13:26:11 -07:00

Batch-ingestion.md

Merge branch 'master' into new-schema

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

Booting-a-production-cluster.md

fixed couple of typos

2014-04-29 10:00:28 -07:00

Broker-Config.md

update docs

2014-04-14 16:33:08 -07:00

Broker.md

…

Build-from-source.md

…

Cluster-setup.md

…

Concepts-and-Terminology.md

…

Configuration.md

minor edit to Metrics Module section

2014-04-16 11:23:47 -07:00

Coordinator-Config.md

…

Coordinator.md

…

Data_formats.md

…

DataSource.md

…

Deep-Storage.md

…

Design.md

…

DimensionSpecs.md

…

Druid-Personal-Demo-Cluster.md

…

Druid-vs-Cassandra.md

…

Druid-vs-Hadoop.md

…

Druid-vs-Impala-or-Shark.md

…

Druid-vs-Redshift.md

…

Druid-vs-Vertica.md

…

Examples.md

update docs for next rel

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

Filters.md

…

Firehose.md

…

GeographicQueries.md

…

Granularities.md

…

GroupByQuery.md

…

Having.md

…

Historical-Config.md

…

Historical.md

…

index.md

…

Indexing-Service-Config.md

update docs for next rel

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

Indexing-Service.md

edits for readability

2014-03-27 15:09:42 -07:00

Ingestion-FAQ.md

fix endpoint bugs and more docs

2014-04-03 17:01:33 -07:00

Libraries.md

…

Middlemanager.md

…

Modules.md

…

MySQL.md

…

OrderBy.md

…

Peons.md

…

Performance-FAQ.md

…

Plumber.md

fix endpoint bugs and more docs

2014-04-03 17:01:33 -07:00

Post-aggregations.md

…

Querying.md

…

Realtime-Config.md

update docs for next rel

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

Realtime-ingestion.md

fix endpoint bugs and more docs

2014-04-03 17:01:33 -07:00

Realtime.md

…

Rule-Configuration.md

…

SearchQuery.md

…

SearchQuerySpec.md

…

SegmentMetadataQuery.md

…

Segments.md

…

SelectQuery.md

update docs

2014-04-22 15:27:19 -07:00

Stand-Alone-With-Riak-CS.md

…

Tasks.md

Merge branch 'master' into new-schema

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

Thanks.md

…

TimeBoundaryQuery.md

…

TimeseriesQuery.md

…

toc.textile

update docs

2014-04-22 15:27:19 -07:00

TopNMetricSpec.md

add docs

2014-04-28 09:51:58 -07:00

TopNQuery.md

…

Tutorial:-A-First-Look-at-Druid.md

update docs for next rel

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

Tutorial:-All-About-Queries.md

…

Tutorial:-Loading-Your-Data-Part-1.md

Fix typo in link back to The Druid Cluster page.

2014-04-19 14:23:40 +08:00

Tutorial:-Loading-Your-Data-Part-2.md

added link to info on rejection policy

2014-03-27 15:16:47 -07:00

Tutorial:-The-Druid-Cluster.md

update docs for next rel

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

Tutorial:-Webstream.md

update docs for next rel

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

Twitter-Tutorial.md

update docs for next rel

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

Versioning.md

…

ZooKeeper.md

…