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

563 Commits

Author SHA1 Message Date
Gian Merlino d0fd58bbae [maven-release-plugin] prepare for next development iteration 2013-12-18 15:35:55 -08:00
Gian Merlino 231d7a6d1f [maven-release-plugin] prepare release druid-0.6.40 2013-12-18 15:35:50 -08:00
Gian Merlino fc4dd51194 Update versions 2013-12-18 15:33:25 -08:00
Hagen Rother fd427a3328 bump the maven shader plugin and config 2013-12-18 17:30:12 +01:00
fjy 494ec53050 [maven-release-plugin] prepare for next development iteration 2013-12-17 17:48:46 -08:00
fjy 2a98a4d3e0 [maven-release-plugin] prepare release druid-0.6.39 2013-12-17 17:48:42 -08:00
fjy d112b2d211 prepare for next release 2013-12-17 17:47:04 -08:00
fjy 0051877f84 fix status endpoint 2013-12-17 17:46:16 -08:00
fjy 5932150d24 [maven-release-plugin] prepare for next development iteration 2013-12-17 16:29:53 -08:00
fjy ed9f4b4cf2 [maven-release-plugin] prepare release druid-0.6.38 2013-12-17 16:29:49 -08:00
fjy 07875dd30b prepare for next release 2013-12-17 16:28:11 -08:00
fjy 69f33b0acd remove commented line 2013-12-17 16:24:15 -08:00
fjy bbb2754a7c fix redirects in druid 2013-12-17 16:22:36 -08:00
fjy 48d677d135 [maven-release-plugin] prepare for next development iteration 2013-12-16 16:17:45 -08:00
fjy 7e0b4d4fd2 [maven-release-plugin] prepare release druid-0.6.37 2013-12-16 16:17:41 -08:00
fjy f2241c8885 prepare for next release 2013-12-16 16:16:00 -08:00
Xavier Léauté ac2ca0e46c separate move and archive tasks 2013-12-16 14:00:55 -08:00
Xavier Léauté a417cd5df2 add archive task 2013-12-16 13:59:15 -08:00
fjy 84233238b1 Merge branch 'master' of github.com:metamx/druid 2013-12-16 12:01:55 -08:00
fjy 0998d835b0 fix redirection issues with master and overlord 2013-12-16 12:01:52 -08:00
Gian Merlino 7759ed4517 Coordinator: Link service announcement to leadership 2013-12-16 11:28:28 -08:00
Himadri Singh 3752122a7b implementing comments from review 2013-12-16 15:16:28 +05:30
fjy 3812bf7215 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:57:07 -08:00
fjy a7ff58f877 [maven-release-plugin] prepare release druid-0.6.36 2013-12-13 16:57:02 -08:00
fjy 87b83bceb1 fix task storage config serde and prepare for next release 2013-12-13 16:55:22 -08:00
fjy 41d64f4aa6 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:47:21 -08:00
fjy 1c050a02f8 [maven-release-plugin] prepare release druid-0.6.35 2013-12-13 16:47:17 -08:00
fjy 01f9c1df31 fix broken task storage config and prepare for next release 2013-12-13 16:45:32 -08:00
fjy 7891e0a2e2 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:20:23 -08:00
fjy 1d75738f81 [maven-release-plugin] prepare release druid-0.6.34 2013-12-13 16:20:18 -08:00
fjy 9a5fd6b0e9 prepare for next release 2013-12-13 16:18:34 -08:00
Gian Merlino 600dc7546f Configurability of recency threshold 2013-12-13 16:02:54 -08:00
fjy 407f8caf94 remove server monitor from list of default monitors 2013-12-13 09:04:32 -08:00
fjy aef7726c33 [maven-release-plugin] prepare for next development iteration 2013-12-12 18:53:18 -08:00
fjy 1d1baf5976 [maven-release-plugin] prepare release druid-0.6.33 2013-12-12 18:53:14 -08:00
fjy 25ebba2c38 fix default start delay of indexing service and prepare for next release 2013-12-12 18:51:25 -08:00
fjy f920dd6fb2 [maven-release-plugin] prepare for next development iteration 2013-12-12 17:28:38 -08:00
fjy 857d24a4ca [maven-release-plugin] prepare release druid-0.6.32 2013-12-12 17:28:34 -08:00
fjy 19eafe0e96 prepare for next release 2013-12-12 17:26:50 -08:00
fjy 7c744ffda0 [maven-release-plugin] prepare for next development iteration 2013-12-12 14:53:01 -08:00
fjy 365da245c2 [maven-release-plugin] prepare release druid-0.6.31 2013-12-12 14:52:57 -08:00
fjy a58f90a689 prepare for next release 2013-12-12 14:51:14 -08:00
Gian Merlino 70c153592f CliPeon: Fix local mode 2013-12-12 14:22:57 -08:00
Gian Merlino c4b8c8bc6f Rework indexing service internals to hopefully be more reliable. 
The TaskQueue directly manages the TaskRunner. The main management loop runs
periodically and checks that the runner is doing reasonable things. If not, it
attempts to adjust the runner. The management loop also runs on-demand when a
task is added to keep task assignment relatively low latency. The TaskConsumer
is no longer necessary and so it no longer exists.

Task interval locks are handled differently. Instead of some tasks acquiring
locks at runtime and some tasks having implicit fixed lock intervals, all tasks
ask for locks explicitly. This occurs either in "isReady" (which runs on the
overlord) or in "run" (which runs on the peon).

Other changes:
- The TaskQueue is attached to the leader lifecycle, instead of global
- The TaskLockbox is able to sync itself from storage and is no longer
  bootstrapped by the TaskQueue.
- RemoteTaskRunner does not clean up zk paths until asked to. This will
  prevent deletion of statuses that have not yet been committed.
- Added retries on DbTaskStorage operations.
- Removed SpawnTasksAction (no more subtasks)
- Removed obsolete EventReceiverFirehose configs
- Removed obsolete OldOverlordResource
- Removed TaskStorageQueryAdapter methods related to subtasks
 2013-12-11 15:05:16 -08:00
Gian Merlino f3cfd1d781 Introduce FileTaskLogs, and move TaskLogs module from server to indexing-service 2013-12-10 17:39:43 -08:00
fjy a7cc559623 [maven-release-plugin] prepare for next development iteration 2013-12-09 20:07:38 -08:00
fjy 54755b8864 [maven-release-plugin] prepare release druid-0.6.30 2013-12-09 20:07:34 -08:00
fjy 6cc0860657 fix s3 module problems and prepare for next release 2013-12-09 20:05:55 -08:00
fjy 7a134272b3 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:45:27 -08:00
fjy 829658f171 [maven-release-plugin] prepare release druid-0.6.29 2013-12-09 18:45:23 -08:00
fjy ab1f02b2bc fix version brokenness and prepare for next release 2013-12-09 18:38:22 -08:00
fjy 98a0f40227 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:35:22 -08:00
fjy 939d2313c0 [maven-release-plugin] prepare release druid-0.6.28 2013-12-09 18:35:18 -08:00
fjy c03d573e84 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:30:15 -08:00
fjy 71fe8a43da [maven-release-plugin] prepare release druid-0.6.27 2013-12-09 18:30:11 -08:00
fjy 976affb3af prepare for next release 2013-12-09 18:28:31 -08:00
fjy 303f6ff334 fix worker config setup problems 2013-12-09 18:25:29 -08:00
fjy 8aba4ad3d2 Merge pull request #311 from metamx/versions 
Add versions to static page
 2013-12-09 17:18:16 -08:00
Himadri Singh b5f6dbc32f Code refactoring, one place! 2013-12-10 02:09:41 +05:30
Himadri Singh 8117fff4e2 Some minor fixes 2013-12-10 00:39:10 +05:30
fjy 7c7cfdf819 [maven-release-plugin] prepare for next development iteration 2013-12-04 18:57:30 -08:00
fjy 6bfb3b8d41 [maven-release-plugin] prepare release druid-0.6.26 2013-12-04 18:57:25 -08:00
fjy fbad1e2d7a fix convert properties with infoPath and prepare for next release 2013-12-04 18:55:35 -08:00
Himadri Singh 32200b9b41 removing debug line. 2013-12-04 11:00:47 +05:30
Himadri Singh 47278ad109 Merge relevant changes from 'druid-version-info' 2013-12-04 10:21:19 +05:30
fjy 1a3a1221c2 [maven-release-plugin] prepare for next development iteration 2013-12-02 14:22:54 -08:00
fjy b18b65108a [maven-release-plugin] prepare release druid-0.6.25 2013-12-02 14:22:50 -08:00
fjy 05f72601c4 fix request time metric and prepare for next release 2013-12-02 14:20:59 -08:00
fjy 730e3a2303 [maven-release-plugin] prepare for next development iteration 2013-11-25 17:55:01 -08:00
fjy c7171e3311 [maven-release-plugin] prepare release druid-0.6.24 2013-11-25 17:54:57 -08:00
fjy ddb6e83f17 fix realtime default and prepare for next deploy 2013-11-25 17:53:17 -08:00
fjy 5c6e647148 [maven-release-plugin] prepare for next development iteration 2013-11-20 12:00:15 -08:00
fjy 5b94895a36 [maven-release-plugin] prepare release druid-0.6.23 2013-11-20 12:00:11 -08:00
fjy fbb65988bd make query resource eagerly instantiate and prepare for next release 2013-11-20 11:58:25 -08:00
fjy ea95566cd9 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:45:21 -08:00
fjy fe7122b717 [maven-release-plugin] prepare release druid-0.6.22 2013-11-20 10:45:17 -08:00
fjy c234dafee1 prepare for next release 2013-11-20 10:43:37 -08:00
fjy 88378eb036 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:28:57 -08:00
fjy 2e6056f537 [maven-release-plugin] prepare release druid-0.6.21 2013-11-20 10:28:52 -08:00
fjy 84a6262e04 prepare for next release 2013-11-20 10:27:09 -08:00
fjy e7167ae00a add new query resource 2013-11-20 10:02:43 -08:00
fjy 7fec5e6ff7 [maven-release-plugin] prepare for next development iteration 2013-11-19 09:59:48 -08:00
fjy 265ef23cd5 [maven-release-plugin] prepare release druid-0.6.20 2013-11-19 09:59:44 -08:00
fjy 984e24c1bb fix broken links in docs, prepare for next release 2013-11-19 09:57:56 -08:00
fjy 67a93ccd4d fix broken validation query config port 2013-11-18 15:53:49 -08:00
fjy 1820110818 clean up docs and fix server monitor double emitting metrics 2013-11-18 15:37:30 -08:00
fjy a86d3af17e fix docs 2013-11-14 18:29:27 -08:00
fjy 48d275e5cb [maven-release-plugin] prepare for next development iteration 2013-11-14 18:20:29 -08:00
fjy c31c5ce1ac [maven-release-plugin] prepare release druid-0.6.19 2013-11-14 18:20:25 -08:00
fjy 346cf0e04c fix out of order in urls for hadoop classpath 2013-11-14 18:18:39 -08:00
fjy d935e1b47b [maven-release-plugin] prepare for next development iteration 2013-11-14 15:08:12 -08:00
fjy 32dbbe4f63 [maven-release-plugin] prepare release druid-0.6.18 2013-11-14 15:08:09 -08:00
fjy 5d00e4075e prepare for next release 2013-11-14 15:06:26 -08:00
fjy 6b41681424 fix ordering of urls, ugh, need to write more tests 2013-11-14 15:06:07 -08:00
fjy 373251a476 [maven-release-plugin] prepare for next development iteration 2013-11-14 14:31:26 -08:00
fjy 7120db20a4 [maven-release-plugin] prepare release druid-0.6.17 2013-11-14 14:31:22 -08:00
fjy 23ebca6d32 more hadoop dependency hell, getting the right urls to hadoop is hard 2013-11-14 14:29:42 -08:00
fjy 89e6ce3550 [maven-release-plugin] prepare for next development iteration 2013-11-14 13:18:24 -08:00
fjy 97293b3f04 [maven-release-plugin] prepare release druid-0.6.16 2013-11-14 13:18:20 -08:00
fjy 61367c6b13 prepare for next release 2013-11-14 13:16:38 -08:00
fjy c51eed060f actually use a class loader pull out dependencies from extension modules 2013-11-14 11:52:21 -08:00
fjy e7118cd9be [maven-release-plugin] prepare for next development iteration 2013-11-14 10:54:37 -08:00
fjy d3f46c826a [maven-release-plugin] prepare release druid-0.6.15 2013-11-14 10:54:32 -08:00
fjy fcf0c6ce06 change the classpath ordering for batch processing and prepare for next release 2013-11-14 10:52:51 -08:00
fjy 60300bdad0 fix doc version 2013-11-13 13:34:57 -08:00
fjy 6e7e2428e8 [maven-release-plugin] prepare for next development iteration 2013-11-13 13:27:47 -08:00
fjy 9c4cecc015 [maven-release-plugin] prepare release druid-0.6.14 2013-11-13 13:27:43 -08:00
fjy 6c41cd8682 [maven-release-plugin] prepare for next development iteration 2013-11-13 11:38:44 -08:00
fjy b93550194a [maven-release-plugin] prepare release druid-0.6.13 2013-11-13 11:38:39 -08:00
fjy c1009f0872 prepare for next release 2013-11-13 11:36:50 -08:00
fjy d0f990129a fix docs 2013-11-13 10:59:03 -08:00
fjy 9bbaade8f9 [maven-release-plugin] prepare for next development iteration 2013-11-13 10:37:12 -08:00
fjy 4dffef698e [maven-release-plugin] prepare release druid-0.6.12 2013-11-13 10:37:08 -08:00
fjy 12a188d8d6 [maven-release-plugin] prepare for next development iteration 2013-11-12 15:20:54 -08:00
fjy 63d9f7362a [maven-release-plugin] prepare release druid-0.6.11 2013-11-12 15:20:47 -08:00
fjy 0681fb614d [maven-release-plugin] prepare for next development iteration 2013-11-08 15:56:10 -08:00
fjy de5984ccea [maven-release-plugin] prepare release druid-0.6.10 2013-11-08 15:56:06 -08:00
fjy 9fe9ca3163 the emitter library is broken and also prepare for next release 2013-11-08 15:54:16 -08:00
fjy d212b3fc43 [maven-release-plugin] prepare for next development iteration 2013-11-08 15:14:46 -08:00
fjy 4cd4578539 [maven-release-plugin] prepare release druid-0.6.9 2013-11-08 15:14:41 -08:00
fjy 822a30658d fix broken http post emitter and prepare for next release 2013-11-08 14:01:16 -08:00
fjy fd4fb78e1f [maven-release-plugin] prepare for next development iteration 2013-11-08 11:34:12 -08:00
fjy f8d5d127a4 [maven-release-plugin] prepare release druid-0.6.8 2013-11-08 11:34:09 -08:00
fjy 64b93bf448 fix broken autoscaling and prepare for next release 2013-11-08 11:29:42 -08:00
fjy 90240e6f1e [maven-release-plugin] prepare for next development iteration 2013-11-07 23:29:02 -08:00
fjy c3d6233bc4 [maven-release-plugin] prepare release druid-0.6.7 2013-11-07 23:28:58 -08:00
fjy d70bcc5657 repair broken pom 2013-11-07 23:27:06 -08:00
fjy a0eedf7342 fix broken docs 2013-11-07 23:11:30 -08:00
fjy d1c3176bf5 update docs ver 2013-11-07 19:47:36 -08:00
fjy fafd9c8d27 [maven-release-plugin] prepare for next development iteration 2013-11-07 18:20:19 -08:00
fjy f945416538 [maven-release-plugin] prepare release druid-0.6.5 2013-11-07 18:20:16 -08:00
fjy ed328aca6e [maven-release-plugin] prepare for next development iteration 2013-11-07 18:03:39 -08:00
fjy e34f1a829b [maven-release-plugin] prepare release druid-0.6.4 2013-11-07 18:03:36 -08:00
fjy a049b42674 fix an issue with task tables not getting created automatically and prepare for next release 2013-11-07 18:01:35 -08:00
fjy 009646ed56 [maven-release-plugin] prepare for next development iteration 2013-11-07 17:40:12 -08:00
fjy 4cde47c9d1 [maven-release-plugin] prepare release druid-0.6.3 2013-11-07 17:40:06 -08:00
fjy d49554185a fix broken default table names 2013-11-07 17:38:00 -08:00
fjy e6a83c0339 [maven-release-plugin] prepare for next development iteration 2013-11-07 17:05:52 -08:00
fjy 2ac09b798d [maven-release-plugin] prepare release druid-0.6.2 2013-11-07 17:05:48 -08:00
fjy 564600e343 remove extra dependency 2013-11-07 16:11:03 -08:00
fjy bdff538ed8 fix poms again 2013-11-07 16:09:01 -08:00
fjy c94455627b fix pom 2013-11-07 16:00:38 -08:00
fjy aeb411a3a3 fix according to code review and fix broken examples 2013-11-07 15:42:48 -08:00
fjy 6b573c76f1 more fixes 2013-11-07 14:40:45 -08:00
fjy ee15fd9f85 [maven-release-plugin] prepare for next development iteration 2013-11-05 15:42:37 -08:00
fjy 713015199a [maven-release-plugin] prepare release druid-0.6.1 2013-11-05 15:42:33 -08:00
fjy 33561031a2 update docs version to match next release 2013-11-05 15:30:41 -08:00
Xavier Léauté dce6e7e0eb hack to support remote repository authentication 2013-11-01 09:33:07 -07:00
Xavier Léauté ef88f37bbe add tools pull-deps to cli 2013-10-30 18:16:27 -07:00
fjy 21235ae533 fix configuration conversion bugs and docs and hdfs configs 2013-10-29 17:34:24 -04:00
fjy a684885839 [maven-release-plugin] prepare for next development iteration 2013-10-18 15:48:16 -07:00
fjy 88dcfe9a94 [maven-release-plugin] prepare release druid-0.6.0 2013-10-18 15:48:12 -07:00
Gian Merlino 2e9c46867f Fixes for indexing service. 
- Create IndexingServiceFirehoseModule so firehoses can be loaded by all mains
- Fix implicit lock acquisition in AbstractTask
 2013-10-18 11:14:33 -07:00
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
fjy 4e509d1d09 Merge branch 'master' into is-docs 2013-10-09 14:05:10 -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 4ec4b8e024 rewrite indexing service docs 2013-10-08 16:34:58 -07:00
fjy ac330f72bb first set of changes to standarize the naming convention we use in druid 2013-10-03 16:36:48 -07:00
fjy bf157ea8ef fix the example assembly and have better error logging for rabbitmq 2013-10-03 10:54:25 -07:00
fjy 17874eeb67 make the CliPeon actually able to run on its own 2013-10-02 15:55:10 -07:00
fjy bc8db7daa5 1) make chat handler resource work again 
2) add more default configs
3) make examples work again
 2013-10-02 14:22:39 -07:00
Gian Merlino 384dcda7e4 Chat handlers still don't work, but, they're closer maybe. 2013-10-01 17:45:53 -07:00
fjy 5d0d71250b fix chat handler resources not correctly registering themselves 2013-10-01 11:25:39 -07:00
fjy d6445cd8f3 remove imports 2013-10-01 09:42:28 -07:00
fjy 53698a135a add interface to new firehose as per code review comments 2013-09-30 18:00:59 -07:00
fjy f55a5199b1 add a firehose module to remove so much copy and pasted code 2013-09-30 16:29:20 -07:00
fjy ed9e0cf9f6 add a local firehose for indexing local files 2013-09-30 16:03:26 -07:00
fjy 4a7a28a7f6 Merge branch 'master' into fix-config 2013-09-27 17:17:46 -07:00
Gian Merlino dc5dab8747 Fixes for property conversion, firehose registration, and the indexing service 2013-09-27 17:09:59 -07:00
fjy a79ad7bab4 make dynamic master resource configuration work again 2013-09-27 15:00:40 -07:00
fjy 0b04325ee8 fix things up according to code review comments 2013-09-27 10:17:45 -07:00
fjy e404295c1f make indexing service work 2013-09-26 17:44:21 -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
fjy 19276f6bad fix spacing issues and other code review comments 2013-09-24 14:34:09 -07:00
fjy be5bb7f2eb fix lifecycle startup/stop ordering problem with discovery module and make druid able to load local extensions 2013-09-24 14:20:56 -07:00
fjy 1ff04412a2 clean up realtime module and fix breakage in broker paths 2013-09-23 16:26:05 -07:00
cheddar 1750b702d7 Add missed com.metamx.druid.emitter.period propery to ConvertProperties 2013-09-23 16:46:37 -05:00
cheddar cc632cdb30 Make Jetty Server lazy 
JettyServerModule had been eagerly instantiating the Server object, which was causing things that didn't care about an HTTP interface to all of a sudden require host and port parameters.  The change makes the JettyServerModule only setup the bindings without eagerly instantiating the Jetty Server.  Each cli needs to register the Server class with the Lifecycle in order to make it actually get used.
 2013-09-23 16:02:24 -05:00
fjy dc8a119787 fix broken unit tests are a result of the last merge 2013-09-23 12:56:01 -07:00
cheddar fefc71e34f Refix the things that were lost in the merge. 2013-09-20 18:01:08 -05:00
cheddar b13ae3f405 Merge branch 'master' into fix-extensionization 
Conflicts:
	services/src/main/java/io/druid/cli/CliBroker.java
	services/src/main/java/io/druid/cli/CliCoordinator.java
 2013-09-20 17:49:13 -05:00
cheddar 5712b29c8c Fix issues with bindings and handling extensions 
The way the Guice bindings were setup previously, each process only had bindings
for the things it cared about.  This became problematic when adding extension modules
that bound everything that they could possibly need expecting that the processes would
only instantiate what they actually do need.  Guice tries to fail-fast and verifies that all
 bindings exist before it does anything, which is a problem because the extension bind
 some objects that don't necessarily have all of their dependencies bound in all processes.

The fix for this is to build a single Injector with all bindings in it and let each of the
 processes only load the things that they care about.  This also requires the use of
 Module overrides and other such interesting things, which are node done.

 In doing the fix, I also swapped out the way that the DataSegmentPusher/Puller stuff is bound, as well as made the Cassandra stuff fail if its settings are not provided.  This all of a sudden made all of the things require Cassandra's settings, so I migrated the Cassandra deep storage stuff into its own module.

 In doing these changes, I also discovered that some properties weren't properly converting for the ConvertProperties command (specifically, the properties related to data segment loading and pushing), so I fixed that.
 2013-09-20 17:45:01 -05:00
fjy f26e13c61a fix broken http endpoints 2013-09-19 17:33:58 -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
fjy f7df951610 broker needs to announce itself in service discovery 2013-09-18 09:23:46 -07:00
fjy cabae7993d port over multi threaded realtime and also fix broken realtime nodes that can't start up 2013-09-16 16:03:47 -07: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
fjy 30bde45556 Merge branch 'master' of github.com:metamx/druid 2013-09-13 18:41:36 -07:00
fjy 5a8b71ddec fix how druid services is assembled 2013-09-13 18:41:33 -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