Commit Graph

216 Commits

Author SHA1 Message Date
Gian Merlino a166344297 [maven-release-plugin] prepare for next development iteration 2013-04-15 18:55:53 -07:00
Gian Merlino 21c2aa5793 [maven-release-plugin] prepare release druid-0.3.38 2013-04-15 18:55:46 -07:00
Gian Merlino d879c9a41e [maven-release-plugin] prepare for next development iteration 2013-04-15 18:17:42 -07:00
Gian Merlino c3d229df7f [maven-release-plugin] prepare release druid-0.3.37 2013-04-15 18:17:36 -07:00
Gian Merlino 128b873022 [maven-release-plugin] prepare for next development iteration 2013-04-15 16:43:53 -07:00
Gian Merlino eb80429177 [maven-release-plugin] prepare release druid-0.3.36 2013-04-15 16:43:47 -07:00
Gian Merlino beff15f8d4 [maven-release-plugin] prepare for next development iteration 2013-04-15 15:03:26 -07:00
Gian Merlino b71ae8ade3 [maven-release-plugin] prepare release druid-0.3.35 2013-04-15 15:03:20 -07:00
Fangjin Yang 6ed0308c59 Merge branch 'master' into stop_task 2013-04-12 22:13:45 -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 4d7dace033 Realtime: Update to kafka-0.7.2
Firehose configs will need to have their "kafka-0.6.3" type changed to
"kafka-0.7.2", and "/kafka" added to the zk.connect string in consumerProps
(kafka-0.6-mmx11 hardcoded this path).
2013-04-10 10:34:09 -07:00
cheddar a678f08b67 Merge pull request #118 from darxriggs/master
cleanup & refactoring
2013-04-09 18:56:59 -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 fb5b1b441e remove conflicting dependencies on ZK 2013-04-09 10:34:12 -07:00
Fangjin Yang 741a13fcac fix inconsistent druid http paths + fix master console bugs 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
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 4e209a1483 remove conflicting dependencies on ZK 2013-03-27 11:43:54 -07:00
Fangjin Yang 5bdcc3613c fix inconsistent druid http paths + fix master console bugs 2013-03-27 10:40:44 -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 a57951c7d6 Merge branch 'stop_task' of github.com:metamx/druid into stop_task 2013-03-25 13:31:19 -07: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 3266139774 RealtimePlumberSchool: Fix wait-for-handoff in finishJob 2013-03-24 18:23:17 -07:00
Fangjin Yang e4c8122f9c Merge branch 'master' of github.com:metamx/druid into stop_task 2013-03-22 12:53:51 -07:00