Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,666 Commits 111 Branches 503 Tags 728 MiB
Commit Graph

953 Commits

Author SHA1 Message Date
fjy a1c09df17f make the hadoop index task work again 2013-10-16 09:45:17 -07:00
fjy 9796a40b92 port docs over to 0.6 and a bunch of misc fixes 2013-10-11 18:38:53 -07:00
fjy a9a723bd11 clean up poms, add a new loading your own data tutorial, add new validation, clean up logs 2013-10-09 15:42:39 -07:00
cheddar c47fe202c7 Fix HadoopDruidIndexer to work with the new way of things 
There are multiple and sundry changes in here.

First, "HadoopDruidIndexer" has been split into two pieces, (1) CliHadoop which pulls the hadoop version and builds up the right classpath with the proper hadoop version to run the indexer and (2) CliInternalHadoopIndexer which actually runs the indexer.

In order to work around a bunch of jets3t version conflicts with Hadoop and Druid, I needed to extract the S3 deep storage stuff into its own module.  I then also moved the HDFS stuff into its own module so that I could eliminate the dependency on Hadoop for druid-server.

In doing these changes, I wanted to make the extensions buildable with only the druid-api jar, so a few other things had to move out of Druid and into druid-api.  They are all API-level things, however, so they really belong in druid-api instead.

Lastly, I removed the druid-realtime module and put it all in druid-server.
 2013-10-09 15:15:44 -05:00
fjy a79ad7bab4 make dynamic master resource configuration work again 2013-09-27 15:00:40 -07:00
fjy 8bc56daa66 fix things up according to code review comments 2013-09-26 11:35:45 -07:00
fjy 87259321b6 port hadoop druid indexer to new guice framework 2013-09-26 11:04:42 -07:00
cheddar dc728b5721 Update versions of poms and make IncrementalIndexStorageAdapterTest compile 2013-09-18 17:01:03 -05:00
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
Gian Merlino 163fa14e62 [maven-release-plugin] prepare for next development iteration 2013-09-13 19:02:46 -07:00
Gian Merlino a20f3fc6dd [maven-release-plugin] prepare release druid-0.5.58 2013-09-13 19:02:40 -07:00
fjy d0b0adbb68 [maven-release-plugin] prepare for next development iteration 2013-09-13 18:57:25 -07:00
fjy 23c5fdb107 [maven-release-plugin] prepare release druid-0.5.57 2013-09-13 18:57:20 -07:00
fjy b0a09ba1f1 [maven-release-plugin] prepare for next development iteration 2013-09-13 18:45:20 -07:00
fjy b17f5c403b [maven-release-plugin] prepare release druid-0.5.56 2013-09-13 18:45:14 -07:00
Gian Merlino 22a99c7589 [maven-release-plugin] prepare for next development iteration 2013-09-13 17:59:03 -07:00
Gian Merlino 542d564453 [maven-release-plugin] prepare release druid-0.5.55 2013-09-13 17:58:56 -07:00
fjy e03c623467 [maven-release-plugin] prepare for next development iteration 2013-09-05 13:48:21 -07:00
fjy 552d0c061a [maven-release-plugin] prepare release druid-0.5.54 2013-09-05 13:48:11 -07:00
fjy 5a64e2a64a [maven-release-plugin] prepare for next development iteration 2013-09-04 14:24:04 -07:00
fjy 523355d00b [maven-release-plugin] prepare release druid-0.5.53 2013-09-04 14:23:56 -07:00
fjy 567168330b [maven-release-plugin] prepare for next development iteration 2013-09-04 14:06:33 -07:00
fjy 39bda32b81 [maven-release-plugin] prepare release druid-0.5.52 2013-09-04 14:06:25 -07:00
fjy f08b8287a4 [maven-release-plugin] prepare for next development iteration 2013-09-04 13:22:19 -07:00
fjy cf9038abb4 [maven-release-plugin] prepare release druid-0.5.51 2013-09-04 13:22:11 -07:00
cheddar 3c39f90c89 1) Move Firehose interface and dependencies to druid-api 
2) Move DataSegment* interfaces and dependencies to druid-api
 2013-08-31 16:43:28 -05:00
cheddar 5ab671050e No more com.metamx.druid, it is now all io.druid! 2013-08-30 19:42:12 -05:00
cheddar bd0756e360 More stuff moved, things still compiling and tests still passing. Yay! 2013-08-30 18:58:35 -05:00
cheddar 56e2b956d0 OMG!!! A lot of stuff has been moved. Modules have been created and destroyed, but everything is compiling and unit tests are passing, OMFG this is awesome.! 2013-08-30 18:21:04 -05:00
cheddar 386cc79420 [maven-release-plugin] prepare for next development iteration 2013-08-29 17:20:10 -05:00
cheddar 83e5e5434e [maven-release-plugin] prepare release druid-0.5.50 2013-08-29 17:20:05 -05:00
cheddar 2a46086e20 1) Didn't remove the io.druid files from client. Remove those and make sure things compile 
2) Switch DefaultObjectMapper to CommonObjectMapper
3) Create new DefaultObjectMapper in client that has Query stuff registered on it by default
 2013-08-29 15:25:36 -05:00
cheddar 5ad023cd3f Merge branch 'master' into guice 2013-08-29 13:59:59 -05:00
cheddar d9a8340dc7 [maven-release-plugin] prepare for next development iteration 2013-08-29 13:29:54 -05:00
cheddar 5118e1da12 [maven-release-plugin] prepare release druid-0.5.49 2013-08-29 13:29:49 -05:00
cheddar 9c30ced5ea 1) Move various "api" classes to io.druid packages and make sure things compile and stuff 2013-08-28 15:51:02 -05:00
cheddar 5fa944dd26 Merge branch 'master' into guice 
Conflicts:
	client/src/main/java/com/metamx/druid/coordination/BatchDataSegmentAnnouncer.java
	client/src/main/java/com/metamx/druid/curator/announcement/Announcer.java
	client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java
	client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/S3TaskLogs.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ForkingTaskRunner.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerCuratorCoordinator.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
	pom.xml
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/http/MasterServletModule.java
	server/src/main/java/com/metamx/druid/master/DruidMasterConfig.java
	server/src/test/java/com/metamx/druid/master/DruidMasterTest.java
	server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
 2013-08-27 14:27:32 -05:00
cheddar b897c2cb22 1) IndexCoordinator appears to work as the CliOverlord now, yay! 2013-08-23 14:11:34 -05:00
cheddar 344ec1ec2f [maven-release-plugin] prepare for next development iteration 2013-08-23 13:20:09 -05:00
cheddar 5b0de6eb5c [maven-release-plugin] prepare release druid-0.5.48 2013-08-23 13:20:02 -05:00
fjy d11d0a8284 fix according to code review 2013-08-22 10:49:46 -07:00
fjy 778fd0f10e Fix persist of empty indexes in index generator job 2013-08-22 10:16:43 -07:00
fjy 4102dbd1e0 [maven-release-plugin] prepare for next development iteration 2013-08-21 21:50:55 -07:00
fjy 0daa2a95fe [maven-release-plugin] prepare release druid-0.5.47 2013-08-21 21:50:46 -07:00
fjy b1d0f989ec [maven-release-plugin] prepare for next development iteration 2013-08-21 20:28:15 -07:00
fjy ab467bf42a [maven-release-plugin] prepare release druid-0.5.46 2013-08-21 20:28:06 -07:00
fjy 1037a48a8e [maven-release-plugin] prepare for next development iteration 2013-08-21 18:55:49 -07:00
fjy 6b9ec95f01 [maven-release-plugin] prepare release druid-0.5.45 2013-08-21 18:55:40 -07:00
fjy ed666d9d5f [maven-release-plugin] prepare for next development iteration 2013-08-20 19:37:52 -07:00
fjy 66dcfe8c3e [maven-release-plugin] prepare release druid-0.5.44 2013-08-20 19:37:44 -07:00
fjy baedacf970 [maven-release-plugin] prepare for next development iteration 2013-08-20 19:29:05 -07:00
fjy a4eb025ba7 [maven-release-plugin] prepare release druid-0.5.43 2013-08-20 19:28:56 -07:00
Gian Merlino a3793eeba4 [maven-release-plugin] prepare for next development iteration 2013-08-20 17:58:28 -07:00
Gian Merlino b792bf2ba5 [maven-release-plugin] prepare release druid-0.5.42 2013-08-20 17:58:22 -07:00
fjy 47ec240703 [maven-release-plugin] prepare for next development iteration 2013-08-15 13:47:57 -07:00
fjy 33e2fb3e21 [maven-release-plugin] prepare release druid-0.5.41 2013-08-15 13:47:48 -07:00
Gian Merlino a0fcd02b3c [maven-release-plugin] prepare for next development iteration 2013-08-14 17:03:40 -07:00
Gian Merlino b6c445c726 [maven-release-plugin] prepare release druid-0.5.40 2013-08-14 17:03:28 -07:00
fjy 36d02ab943 [maven-release-plugin] prepare for next development iteration 2013-08-14 14:05:49 -07:00
fjy 8c841e90a4 [maven-release-plugin] prepare release druid-0.5.39 2013-08-14 14:05:39 -07:00
fjy 761a411b16 [maven-release-plugin] prepare for next development iteration 2013-08-14 10:13:50 -07:00
fjy 4dd727d974 [maven-release-plugin] prepare release druid-0.5.38 2013-08-14 10:13:34 -07:00
fjy 9870cab855 [maven-release-plugin] prepare for next development iteration 2013-08-13 17:21:56 -07:00
fjy e4c998cfef [maven-release-plugin] prepare release druid-0.5.37 2013-08-13 17:21:46 -07:00
Gian Merlino 246bd0fbaa [maven-release-plugin] prepare for next development iteration 2013-08-13 07:27:24 -07:00
Gian Merlino a2e9441693 [maven-release-plugin] prepare release druid-0.5.36 2013-08-13 07:27:18 -07:00
fjy d4fc069e01 [maven-release-plugin] prepare for next development iteration 2013-08-12 18:58:14 -07:00
fjy dd8c96c734 [maven-release-plugin] prepare release druid-0.5.35 2013-08-12 18:58:06 -07:00
fjy 1f4e0ea40c [maven-release-plugin] prepare for next development iteration 2013-08-12 13:21:29 -07:00
fjy 1c2ad4f08c [maven-release-plugin] prepare release druid-0.5.34 2013-08-12 13:21:21 -07:00
fjy 68a3f1ab79 [maven-release-plugin] prepare for next development iteration 2013-08-08 22:15:04 -07:00
fjy ce5679554d [maven-release-plugin] prepare release druid-0.5.33 2013-08-08 22:14:55 -07:00
fjy ddc2e87c4c [maven-release-plugin] prepare for next development iteration 2013-08-06 21:21:28 -07:00
fjy ffbcd18cdc [maven-release-plugin] prepare release druid-0.5.32 2013-08-06 21:21:18 -07:00
fjy 4617d37e28 [maven-release-plugin] prepare for next development iteration 2013-08-06 21:08:02 -07:00
fjy 53b248dc28 [maven-release-plugin] prepare release druid-0.5.31 2013-08-06 21:07:52 -07:00
Gian Merlino 99a3de1597 [maven-release-plugin] prepare for next development iteration 2013-08-06 17:41:58 -07:00
Gian Merlino c0ccfd66ea [maven-release-plugin] prepare release druid-0.5.30 2013-08-06 17:41:51 -07:00
fjy 930b089f7f [maven-release-plugin] prepare for next development iteration 2013-08-06 16:20:37 -07:00
fjy dd5f5ae49b [maven-release-plugin] prepare release druid-0.5.29 2013-08-06 16:20:29 -07:00
cheddar eee1efdcb5 Merge branch 'master' into guice 
Conflicts:
	client/src/main/java/com/metamx/druid/client/DruidServerConfig.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/index/ChatHandlerProvider.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
 2013-08-06 13:33:31 -07:00
Gian Merlino ba847bff32 [maven-release-plugin] prepare for next development iteration 2013-08-05 19:58:40 -07:00
Gian Merlino 7101d9ad2e [maven-release-plugin] prepare release druid-0.5.28 2013-08-05 19:58:34 -07:00
fjy db695f49c2 [maven-release-plugin] prepare for next development iteration 2013-08-05 18:26:20 -07:00
fjy c22e5b7ee0 [maven-release-plugin] prepare release druid-0.5.27 2013-08-05 18:26:10 -07:00
fjy 8ff0b53df4 [maven-release-plugin] prepare for next development iteration 2013-08-05 18:00:46 -07:00
fjy 1d3729906d [maven-release-plugin] prepare release druid-0.5.26 2013-08-05 18:00:36 -07:00
fjy 90e082463b [maven-release-plugin] prepare for next development iteration 2013-08-05 16:10:19 -07:00
fjy eb276d34d7 [maven-release-plugin] prepare release druid-0.5.25 2013-08-05 16:10:11 -07:00
fjy a95d9c46e2 [maven-release-plugin] prepare for next development iteration 2013-08-05 14:47:35 -07:00
fjy 8e1f4d3256 [maven-release-plugin] prepare release druid-0.5.24 2013-08-05 14:47:26 -07:00
fjy fbb1211cbc [maven-release-plugin] prepare for next development iteration 2013-08-05 11:44:36 -07:00
fjy 22a90d36b7 [maven-release-plugin] prepare release druid-0.5.23 2013-08-05 11:44:28 -07:00
cheddar 3c808b15c3 1) Fix HadoopDruidIndexerConfigTest to actually verify the current correct behavior. 2013-08-05 11:37:20 -07:00
cheddar 2b71505421 1) Fix HadoopDruidIndexerConfig to no longer replace ":" with "_" on the segmentOutputDir. The segmentOutputDir is user-supplied so they should have the ability to just not set a bad directory. 2013-08-05 11:22:26 -07:00
cheddar 2361e0112a Make it all compile again... 2013-08-02 10:14:46 -07:00
cheddar 9e78bb38f5 Merge branch 'master' into guice 
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	client/src/main/java/com/metamx/druid/client/ServerInventoryView.java
	client/src/main/java/com/metamx/druid/coordination/SingleDataSegmentAnnouncer.java
	client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java
	client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java
	indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorNode.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/http/WorkerNode.java
	pom.xml
	server/src/main/java/com/metamx/druid/coordination/ServerManager.java
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
	server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/loading/SegmentLoaderConfig.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
 2013-08-01 16:42:47 -07:00
cheddar 66adef5d64 Merge pull request #179 from zanox/master 
Fix path used when storing segments to HDFS
 2013-07-30 11:13:29 -07:00
fjy b0090a1de6 [maven-release-plugin] prepare for next development iteration 2013-07-25 17:26:44 -07:00
fjy 6868153905 [maven-release-plugin] prepare release druid-0.5.22 2013-07-25 17:26:36 -07:00
fjy cf0cb3b703 [maven-release-plugin] prepare for next development iteration 2013-07-25 16:55:28 -07:00
fjy 8297f068c3 [maven-release-plugin] prepare release druid-0.5.21 2013-07-25 16:55:20 -07:00
fjy f68a68112f [maven-release-plugin] prepare for next development iteration 2013-07-25 16:21:59 -07:00
fjy b6e8d11aec [maven-release-plugin] prepare release druid-0.5.20 2013-07-25 16:21:49 -07:00
fjy cfc635de53 [maven-release-plugin] prepare for next development iteration 2013-07-24 09:41:30 -07:00
fjy 09576ccd09 [maven-release-plugin] prepare release druid-0.5.19 2013-07-24 09:41:20 -07:00
fjy 1b56fa5416 [maven-release-plugin] prepare for next development iteration 2013-07-18 15:37:54 -07:00
fjy 0c11602623 [maven-release-plugin] prepare release druid-0.5.18 2013-07-18 15:37:16 -07:00
fjy 816f673a47 [maven-release-plugin] prepare for next development iteration 2013-07-18 15:14:47 -07:00
fjy bcb1b99410 [maven-release-plugin] prepare release druid-0.5.17 2013-07-18 15:14:32 -07:00
fjy 357d77aca2 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:53:56 -07:00
fjy b5b6cd6594 [maven-release-plugin] prepare release druid-0.5.16 2013-07-18 14:53:46 -07:00
fjy 08f56feee3 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:48:53 -07:00
fjy 74b4c577f0 [maven-release-plugin] prepare release druid-0.5.15 2013-07-18 14:48:42 -07:00
fjy 5b55db6a42 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:28:54 -07:00
fjy 3792a54869 [maven-release-plugin] prepare release druid-0.5.14 2013-07-18 14:28:46 -07:00
fjy 2f63140f2f [maven-release-plugin] prepare for next development iteration 2013-07-18 14:17:16 -07:00
fjy 4481b10efc [maven-release-plugin] prepare release druid-0.5.13 2013-07-18 14:16:55 -07:00
fjy df88274d9e fix poms 2013-07-18 14:14:16 -07:00
fjy 325a5fb4c0 [maven-release-plugin] prepare release druid-0.5.12 2013-07-18 14:09:56 -07:00
fjy cef0e50881 [maven-release-plugin] prepare for next development iteration 2013-07-17 09:14:37 -07:00
fjy 22526a6c68 [maven-release-plugin] prepare release druid-0.5.11 2013-07-17 09:14:28 -07:00
fjy 43bdb99593 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:55:42 -07:00
fjy d5fee45bf4 [maven-release-plugin] prepare release druid-0.5.10 2013-07-16 17:55:29 -07:00
fjy f3187b67a5 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:32:05 -07:00
fjy eb89857bdc [maven-release-plugin] prepare release druid-0.5.9 2013-07-16 17:31:55 -07:00
fjy 0f492e17c3 [maven-release-plugin] prepare for next development iteration 2013-07-16 16:53:51 -07:00
fjy a3879d1151 [maven-release-plugin] prepare release druid-0.5.8 2013-07-16 16:53:41 -07:00
fjy f422bfae8c [maven-release-plugin] prepare for next development iteration 2013-07-16 13:35:38 -07:00
fjy cd174dbd80 [maven-release-plugin] prepare release druid-0.5.7 2013-07-16 13:35:29 -07:00
fjy afac15d631 fix version problem 2013-07-16 13:32:50 -07:00
fjy 36756aa557 [maven-release-plugin] prepare release druid-0.5.6 2013-07-16 13:30:16 -07:00
Jan Rudert ad087a7a22 correct segment path for hadoop indexer 2013-07-10 09:21:45 +02:00
cheddar fd1d73e83a [maven-release-plugin] prepare for next development iteration 2013-07-01 16:04:31 -07:00
cheddar 090921b43e [maven-release-plugin] prepare release druid-0.5.5 2013-07-01 16:04:25 -07:00
fjy b96d6b3546 [maven-release-plugin] prepare for next development iteration 2013-06-10 14:11:19 -07:00
fjy c465d4ef8c [maven-release-plugin] prepare release druid-0.5.4 2013-06-10 14:11:09 -07:00
cheddar 2f56c24259 1) Inject IndexingServiceClient 
2) Switch all the DBI references to IDBI
 2013-06-07 17:37:33 -07:00
fjy 12e78955db [maven-release-plugin] prepare for next development iteration 2013-06-07 14:17:39 -07:00
fjy 962db29e70 [maven-release-plugin] prepare release druid-0.5.3 2013-06-07 14:17:32 -07:00
cheddar f68df7ab69 1) Make tests work and continue trying to make the DruidMaster start up with just Guice 2013-06-07 12:01:46 -07:00
Gian Merlino 67be515db6 [maven-release-plugin] prepare for next development iteration 2013-06-06 18:25:07 -07:00
Gian Merlino 8dbb69c8a8 [maven-release-plugin] prepare release druid-0.5.2 2013-06-06 18:24:59 -07:00
fjy ee38ca5463 [maven-release-plugin] prepare for next development iteration 2013-06-06 18:00:31 -07:00
fjy a36d0007ac [maven-release-plugin] prepare release druid-0.5.1 2013-06-06 18:00:24 -07:00
fjy d5b7e644b6 [maven-release-plugin] prepare for next development iteration 2013-06-06 16:10:45 -07:00
fjy 2113715f5d [maven-release-plugin] prepare release druid-0.5.0 2013-06-06 16:10:39 -07:00
fjy 8202bc70eb optimize spatial and update poms everywhere 2013-06-05 15:26:40 -07:00
fjy 42cc87a294 Merge branch 'master' into refactor-indexing 
Conflicts:
	indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexTask.java
	pom.xml
 2013-05-31 17:28:59 -07:00
fjy 8b8c59d309 Merge branch 'master' into refactor-indexing 2013-05-16 17:35:50 -07:00
fjy 08d84001ba Merge branch 'master' into refactor-indexing 2013-05-16 16:03:29 -07:00
fjy 835187be6f fix poms to pass unit tests 2013-05-15 17:38:59 -07:00
fjy 26e0eb62cb merge and other refactorings 2013-05-15 17:28:08 -07:00