2 Commits

Author	SHA1	Message	Date
fjy	f123a14373	Merge branch 'master' into az ... Conflicts: docs/content/Realtime.md server/src/main/java/io/druid/client/selector/ServerSelector.java	2014-01-09 19:09:38 -08:00
Igal Levy	39012c6dbe	Separated realitme ingestion from realtime node info; under Data Ingestion the Realtime link now points to the new realtime-ingestion page	2013-12-20 13:43:55 -08:00