druid

mirror of https://github.com/apache/druid.git synced 2025-02-10 12:05:00 +00:00

History

fjy 2aabc6c4e6 Merge branch 'master' into select

Conflicts:
	processing/src/main/java/io/druid/query/Query.java
	server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java
	server/src/main/java/io/druid/guice/QueryToolChestModule.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java

2014-01-08 16:31:19 -08:00

figures

fix figures

2013-12-09 17:57:29 -08:00

src

first set of changes to standarize the naming convention we use in druid

2013-10-03 16:36:48 -07:00

.gitignore

first set of changes to standarize the naming convention we use in druid

2013-10-03 16:36:48 -07:00

acm_proc_article-sp.cls

updates to images in paper and some fixes