Gian Merlino d32a6284ce Merge branch 'task-stuff' into indexing_refactor ... Conflicts: merger/src/main/java/com/metamx/druid/merger/worker/config/WorkerConfig.java		2013-02-26 13:03:56 -08:00
..
java/druid/examples	Merge branch 'task-stuff' into indexing_refactor	2013-02-26 13:03:56 -08:00
resources	1) Introduce idea of value types and generic columns to the serialization format	2013-01-04 18:12:49 -06:00