Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
845 Commits 112 Branches 504 Tags 711 MiB
Commit Graph

364 Commits

Author SHA1 Message Date
Fangjin Yang 8a4ec1cd17 Merge branch 'stop_task' of github.com:metamx/druid into stop_task 2013-04-12 22:13:22 -07:00
Fangjin Yang bacb1e5520 update fix 2013-04-12 22:12:22 -07:00
Gian Merlino a0b2a34845 Merge branch 'master' into stop_task 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/actions/LockListAction.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/ExecutorServiceTaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
 2013-04-12 14:10:27 -07:00
Gian Merlino c21d7f6ee2 ForkingTaskRunner: Slight tweaks to setup and teardown 2013-04-12 14:06:51 -07:00
Fangjin Yang a24274029f change shutdown logic for firehose 2013-04-12 11:49:01 -07:00
Fangjin Yang 465b78b4bc more changes 2013-04-10 20:21:26 -07:00
Gian Merlino eaea8ae163 - Ability to cancel pending tasks in the ForkingTaskRunner. 
- Other various changes from code review.
 2013-04-10 19:54:22 -07:00
cheddar a678f08b67 Merge pull request #118 from darxriggs/master 
cleanup & refactoring
 2013-04-09 18:56:59 -07:00
Gian Merlino f90304d07b Merger: Task logging system 2013-04-09 10:34:15 -07:00
Gian Merlino 33434f2c82 Executor: Move most logic out of main 2013-04-09 10:34:14 -07:00
Fangjin Yang e125a58f0e [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:14 -07:00
Fangjin Yang 27cef03724 [maven-release-plugin] prepare release druid-0.3.33 2013-04-09 10:34:14 -07:00
Fangjin Yang 2fcf7e018b [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:14 -07:00
Fangjin Yang 4f232fe430 [maven-release-plugin] prepare release druid-0.3.32 2013-04-09 10:34:14 -07:00
Fangjin Yang bf2f2df22c [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:13 -07:00
Fangjin Yang d4dc593ecc [maven-release-plugin] prepare release druid-0.3.31 2013-04-09 10:34:13 -07:00
Fangjin Yang 185d367153 [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:12 -07:00
Fangjin Yang ff0fdc15c2 [maven-release-plugin] prepare release druid-0.3.30 2013-04-09 10:34:12 -07:00
Fangjin Yang dbb03deb26 [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:12 -07:00
Fangjin Yang ef50da3b9b [maven-release-plugin] prepare release druid-0.3.29 2013-04-09 10:34:12 -07:00
Fangjin Yang 6fe9707f96 [maven-release-plugin] prepare for next development iteration 2013-04-08 11:26:37 -07:00
Fangjin Yang f0ab28be90 [maven-release-plugin] prepare release druid-0.3.34 2013-04-08 11:26:32 -07:00
Fangjin Yang 120b822c18 Merge branch 'master' of github.com:metamx/druid 
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
 2013-04-08 11:24:17 -07:00
Fangjin Yang 925c104dd2 update emitter version and fix some NPEs 2013-04-08 11:23:08 -07:00
René Scheibe 6c27cd2e8e cleanup - removed unused imports 2013-04-07 23:31:22 +02:00
René Scheibe a6dc29cf85 cleanup - removed extra empty lines 
- there should not be any adjacent empty lines
 2013-04-07 14:32:09 +02:00
Eric Tschetter 0b621c7bde 1) Expand logging of unregistering real-time segments to help diagnose strange zookeeper behavior 2013-04-06 11:10:36 -05:00
Fangjin Yang 8b100248a8 [maven-release-plugin] prepare for next development iteration 2013-04-01 17:17:50 -07:00
Fangjin Yang bbb3991bc9 [maven-release-plugin] prepare release druid-0.3.33 2013-04-01 17:17:44 -07:00
Fangjin Yang e8c6936aca [maven-release-plugin] prepare for next development iteration 2013-04-01 14:28:43 -07:00
Fangjin Yang 1f342dc0f2 [maven-release-plugin] prepare release druid-0.3.32 2013-04-01 14:28:36 -07:00
Fangjin Yang 30465b5c26 [maven-release-plugin] prepare for next development iteration 2013-03-28 19:48:46 -07:00
Fangjin Yang 1515dddfe0 [maven-release-plugin] prepare release druid-0.3.31 2013-03-28 19:48:39 -07:00
Fangjin Yang 04a46fb74f [maven-release-plugin] prepare for next development iteration 2013-03-28 19:21:14 -07:00
Fangjin Yang 36601ee3aa [maven-release-plugin] prepare release druid-0.3.30 2013-03-28 19:21:07 -07:00
Fangjin Yang 9e54e11827 [maven-release-plugin] prepare for next development iteration 2013-03-27 11:55:48 -07:00
Fangjin Yang 8fee044c68 [maven-release-plugin] prepare release druid-0.3.29 2013-03-27 11:55:38 -07:00
Fangjin Yang 537f527960 Merge branch 'master' into stop_task 
Conflicts:
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
 2013-03-26 14:14:23 -07:00
Fangjin Yang e785b87be0 [maven-release-plugin] prepare for next development iteration 2013-03-26 11:10:15 -07:00
Fangjin Yang a97287fa50 [maven-release-plugin] prepare release druid-0.3.28 2013-03-26 11:10:04 -07:00
Fangjin Yang f38566de7a Merge branch 'master' of github.com:metamx/druid 2013-03-26 10:26:12 -07:00
Fangjin Yang a7d836a0dd fix NPE for master balancing; introduce max number of workers for indexing service 2013-03-26 10:25:52 -07:00
Eric Tschetter 42ca6aff4f Merge branch 'master' of github.com:metamx/druid 2013-03-26 09:07:28 -05:00
Eric Tschetter 2306602e93 1) Remove zookeeper 3.4.3 dependency from merger 2013-03-26 09:06:11 -05:00
Fangjin Yang f0f4eee787 Merge branch 'master' into stop_task 2013-03-25 13:31:03 -07:00
Fangjin Yang efd57dcf38 [maven-release-plugin] prepare for next development iteration 2013-03-25 13:17:50 -07:00
Fangjin Yang 3d7a0ea2d3 [maven-release-plugin] prepare release druid-0.3.27 2013-03-25 13:17:43 -07:00
Gian Merlino dcd10e69c7 WorkerTaskMonitor: Fix isTaskRunning check 2013-03-24 18:19:32 -07:00
Fangjin Yang e4c8122f9c Merge branch 'master' of github.com:metamx/druid into stop_task 2013-03-22 12:53:51 -07:00
Eric Tschetter 35cfd1f186 [maven-release-plugin] prepare for next development iteration 2013-03-21 13:14:20 -05:00