fjy 70937af7bd Merge branch 'master' of github.com:metamx/druid into spatial
Conflicts:
	server/src/main/java/com/metamx/druid/index/v1/IndexStorageAdapter.java
	server/src/main/java/com/metamx/druid/index/v1/QueryableIndexStorageAdapter.java
2013-04-23 11:40:44 -07:00
..