cheddar 6bfe2310bb Merge branch 'master' into guice ... Conflicts: client/pom.xml client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java indexing-common/pom.xml indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java server/src/main/java/com/metamx/druid/BaseServerNode.java server/src/main/java/com/metamx/druid/http/ComputeNode.java server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java		2013-09-18 16:46:54 -05:00
..
src	throw exception for annotated members	2013-09-16 17:36:31 -07:00
pom.xml	Merge branch 'master' into guice	2013-09-18 16:46:54 -05:00