Xavier Léauté c88de97370 Merge branch 'master' into onheap-incremental-index
Conflicts:
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
2014-12-08 11:48:21 -08:00
..
2014-11-26 19:33:52 +05:30