Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,839 Commits 113 Branches 506 Tags 732 MiB
Commit Graph

470 Commits

Author SHA1 Message Date
Pablo Nebrera e9ce6b596c PostgresSQL integration with druid 2013-06-28 12:49:24 +02:00
Dhruv Parthasarathy c15f18c343 removed NoopRunnable 2013-06-27 19:03:25 -07:00
fjy 15a4dae2b1 bunch of issue fixes 2013-06-26 10:45:54 -07:00
Dhruv Parthasarathy 4e4a0a7953 removed DS_Store files 2013-06-25 14:58:12 -07:00
cheddar 149c2e3560 1) A bunch more changes to make things actually run. Not quite done, but close! 2013-06-20 17:19:51 -07:00
Dhruv Parthasarathy 748695bf97 trying to recover my files on intellij 2013-06-20 14:59:52 -07:00
cheddar 11ea15fc1a 1) Introduce Jetty 8 
2) Fix up modules based on exceptions at startup for MasterMain
 2013-06-17 10:53:50 -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
cheddar 9df458a065 1) Initial commit of conversion to using Guice modules for bootstrapping. Things don't actually completely work yet. 2013-06-06 15:43:15 -07:00
fjy 8202bc70eb optimize spatial and update poms everywhere 2013-06-05 15:26:40 -07:00
fjy 93e7ea3787 [maven-release-plugin] prepare for next development iteration 2013-05-31 15:53:23 -07:00
fjy 3d28fcd5e0 [maven-release-plugin] prepare release druid-0.4.32 2013-05-31 15:53:17 -07:00
fjy c02113879d [maven-release-plugin] prepare for next development iteration 2013-05-31 14:00:45 -07:00
fjy 5a3f69ae78 [maven-release-plugin] prepare release druid-0.4.31 2013-05-31 14:00:39 -07:00
fjy 9cb9f4753d [maven-release-plugin] prepare for next development iteration 2013-05-29 09:50:10 -07:00
fjy dd9ac03809 [maven-release-plugin] prepare release druid-0.4.30 2013-05-29 09:50:02 -07:00
fjy 73a392d94a [maven-release-plugin] prepare for next development iteration 2013-05-28 14:28:49 -07:00
fjy c6eec7eb27 [maven-release-plugin] prepare release druid-0.4.29 2013-05-28 14:28:42 -07:00
fjy bd9e6fecc1 fix day 1 issue with VIT 2013-05-28 14:26:49 -07:00
fjy 54932e3187 [maven-release-plugin] prepare for next development iteration 2013-05-26 13:43:28 -06:00
fjy 9d105ef4ad [maven-release-plugin] prepare release druid-0.4.28 2013-05-26 13:43:21 -06:00
fjy 69a9e04563 [maven-release-plugin] prepare for next development iteration 2013-05-26 13:33:05 -06:00
fjy 39ae7485fd [maven-release-plugin] prepare release druid-0.4.27 2013-05-26 13:32:57 -06:00
fjy e08770695f [maven-release-plugin] prepare for next development iteration 2013-05-23 11:53:29 -06:00
fjy 4c8d9e9f16 [maven-release-plugin] prepare release druid-0.4.26 2013-05-23 11:53:21 -06:00
fjy b5e30cf701 [maven-release-plugin] prepare for next development iteration 2013-05-23 11:05:24 -06:00
fjy 8cc4202fd5 [maven-release-plugin] prepare release druid-0.4.25 2013-05-23 11:05:18 -06:00
fjy 27d4f46156 [maven-release-plugin] prepare for next development iteration 2013-05-22 23:55:15 -07:00
fjy 07ac16633c [maven-release-plugin] prepare release druid-0.4.24 2013-05-22 23:55:06 -07:00
fjy 3299900690 [maven-release-plugin] prepare for next development iteration 2013-05-22 13:36:50 -07:00
fjy 08f1cfb68e [maven-release-plugin] prepare release druid-0.4.23 2013-05-22 13:36:44 -07:00
fjy 3a9d892b05 [maven-release-plugin] prepare for next development iteration 2013-05-21 21:34:42 -07:00
fjy 7e6350321b [maven-release-plugin] prepare release druid-0.4.22 2013-05-21 21:34:34 -07:00
fjy aa5280028f [maven-release-plugin] prepare for next development iteration 2013-05-21 17:12:23 -07:00
fjy c6436dad78 [maven-release-plugin] prepare release druid-0.4.21 2013-05-21 17:12:16 -07:00
fjy e404442ad4 [maven-release-plugin] prepare for next development iteration 2013-05-20 20:21:03 -07:00
fjy b7604c2332 [maven-release-plugin] prepare release druid-0.4.20 2013-05-20 20:20:55 -07:00
fjy cccd5758de [maven-release-plugin] prepare for next development iteration 2013-05-20 13:46:28 -07:00
fjy a9837cc1dd [maven-release-plugin] prepare release druid-0.4.19 2013-05-20 13:46:18 -07:00
fjy 9376a313fc [maven-release-plugin] prepare for next development iteration 2013-05-20 12:19:58 -07:00
fjy af494be074 [maven-release-plugin] prepare release druid-0.4.18 2013-05-20 12:19:50 -07:00
Gian Merlino e28a896463 [maven-release-plugin] prepare for next development iteration 2013-05-18 17:37:30 -07:00
Gian Merlino 8ba757d8d7 [maven-release-plugin] prepare release druid-0.4.17 2013-05-18 17:37:23 -07:00
Gian Merlino 612f1fb39b [maven-release-plugin] prepare for next development iteration 2013-05-16 16:31:19 -07:00
Gian Merlino c6a36c6522 [maven-release-plugin] prepare release druid-0.4.16 2013-05-16 16:31:12 -07:00
Gian Merlino aa29af8b24 [maven-release-plugin] prepare for next development iteration 2013-05-16 14:54:12 -07:00
Gian Merlino 5905b6ea6b [maven-release-plugin] prepare release druid-0.4.15 2013-05-16 14:54:04 -07:00
Gian Merlino 83fa572ab3 [maven-release-plugin] prepare for next development iteration 2013-05-14 14:43:38 -07:00
Gian Merlino ecf52f4265 [maven-release-plugin] prepare release druid-0.4.14 2013-05-14 14:43:29 -07:00
Gian Merlino 343af872b5 DbConnectorConfig: Serialization is hard 2013-05-14 14:39:29 -07:00
Gian Merlino 8999080801 [maven-release-plugin] prepare for next development iteration 2013-05-14 13:59:17 -07:00
Gian Merlino 55a986bc7d [maven-release-plugin] prepare release druid-0.4.13 2013-05-14 13:59:07 -07:00
fjy 7d34710edf [maven-release-plugin] prepare for next development iteration 2013-05-13 17:31:11 -07:00
fjy d8d7d92f65 [maven-release-plugin] prepare release druid-0.4.12 2013-05-13 17:31:02 -07:00
fjy 2c45f33497 [maven-release-plugin] prepare for next development iteration 2013-05-13 12:39:09 -07:00
fjy 57e1cf5f1d [maven-release-plugin] prepare release druid-0.4.11 2013-05-13 12:39:01 -07:00
fjy 82c4cd5641 [maven-release-plugin] prepare for next development iteration 2013-05-13 11:08:39 -07:00
fjy 1860104abe [maven-release-plugin] prepare release druid-0.4.10 2013-05-13 11:08:29 -07:00
fjy 219a8d7d05 [maven-release-plugin] prepare for next development iteration 2013-05-12 15:19:19 -07:00
fjy 64febd47d7 [maven-release-plugin] prepare release druid-0.4.9 2013-05-12 15:19:12 -07:00
xvrl 8388d0593a [maven-release-plugin] prepare for next development iteration 2013-05-08 10:56:22 -07:00
xvrl 79665d325f [maven-release-plugin] prepare release druid-0.4.8 2013-05-08 10:56:12 -07:00
fjy e20aabd7a9 [maven-release-plugin] prepare for next development iteration 2013-05-08 10:17:25 -07:00
fjy 758baa913b [maven-release-plugin] prepare release druid-0.4.7 2013-05-08 10:17:17 -07:00
fjy 43d3c53806 fix order by double sum agg 2013-05-08 10:14:40 -07:00
fjy 913cf37060 [maven-release-plugin] prepare for next development iteration 2013-05-07 09:32:54 -07:00
fjy d883001aaa [maven-release-plugin] prepare release druid-0.4.6 2013-05-07 09:32:46 -07:00
fjy f7dfea056b [maven-release-plugin] prepare for next development iteration 2013-05-06 14:30:11 -07:00
fjy a4bd6bc843 [maven-release-plugin] prepare release druid-0.4.5 2013-05-06 14:30:03 -07:00
fjy f34d73aaff fix pom versions because of failed release 2013-05-06 14:27:22 -07:00
fjy 0eb7b248d9 [maven-release-plugin] prepare release druid-0.4.4 2013-05-06 14:24:16 -07:00
cheddar de720e6e1a [maven-release-plugin] prepare for next development iteration 2013-05-03 18:41:39 -05:00
cheddar ba2b2fb39f [maven-release-plugin] prepare release druid-0.4.3 2013-05-03 18:41:33 -05:00
cheddar c89f4cc85f [maven-release-plugin] prepare for next development iteration 2013-05-03 12:17:05 -05:00
cheddar 4fef7c2c43 [maven-release-plugin] prepare release druid-0.4.2 2013-05-03 12:16:57 -05:00
cheddar 3c04f1635c 1) Fix bug with same name on multiple JSON properties 2013-05-02 18:00:50 -05:00
cheddar 5f184ea978 [maven-release-plugin] prepare for next development iteration 2013-05-02 17:13:28 -05:00
cheddar df6fd5eca7 [maven-release-plugin] prepare release druid-0.4.1 2013-05-02 17:13:22 -05:00
cheddar 60b279b0d3 1) Add support for storing segments in HDFS 2013-04-30 12:47:43 -05:00
cheddar 3e94204c44 1) Switch from com.netflix.curator to org.apache.curator 2013-04-26 19:19:55 -05:00
cheddar 43d630c098 1) Replace InventoryManagers with Curator-based Inventory Managers 
2) Replace ZkSegmentAnnouncer with CuratorSegmentAnnouncer
3) Adjust LoadQueuePeons to operate using Curator
4) Remove ZkPhoneBook

Things left to do:
1) Unit tests
2) Remove references to zkclient library
3) Remove references to PhoneBook interface
 2013-04-26 19:19:23 -05:00
Gian Merlino deefa870ec [maven-release-plugin] prepare for next development iteration 2013-04-19 17:15:07 -07:00
Gian Merlino 5ea1a77a45 [maven-release-plugin] prepare release druid-0.4.0 2013-04-19 17:15:00 -07:00
Gian Merlino dbfa045df0 DbConnector: SQL and validation query tweaks 2013-04-19 14:51:22 -07:00
Gian Merlino 1a6594524f Merger: Tweaks to DB tables. Create tables automatically. 2013-04-19 14:07:27 -07:00
Gian Merlino 1dfe133554 DbConnector: Optional validation query (default off for now) 2013-04-19 14:07:27 -07:00
xvrl db2f3aa761 fix pom versions 2013-04-16 09:53:34 -07:00
xvrl 66a52ed282 javascript aggregator now uses column selector 2013-04-16 09:33:50 -07:00
xvrl b66f69def6 specify javascript aggregator functions individually to support getCombiningFactory() 2013-04-16 09:33:50 -07:00
xvrl c83631928c object column selectors 2013-04-16 09:33:50 -07:00
xvrl 0c68bd1b1d rename MetricSelectorFactory to ColumnSelectorFactory 2013-04-16 09:33:49 -07:00
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
Eric Tschetter 55648c47a7 1) Adjust the GroupByQuery to also be able to merge results on the local node. Fixes #116 
2) Make the GroupByQuery operate in a multi-threaded fashion by default (this is configurable via druid.query.groupBy.singleThreaded).  Fixes #96
3) Fix up some post aggregation computation stuff.  I believe #72 is fixed
4) Fix case sensitivity issue with post aggregations on GroupBy queries
 2013-04-09 19:13:08 -07:00
cheddar a678f08b67 Merge pull request #118 from darxriggs/master 
cleanup & refactoring
 2013-04-09 18:56:59 -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
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 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 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
fjy 05fdf08644 Merge pull request #107 from metamx/aggregator-close 
add close method to aggregators
 2013-03-25 13:09:19 -07:00
Eric Tschetter 35cfd1f186 [maven-release-plugin] prepare for next development iteration 2013-03-21 13:14:20 -05:00
Eric Tschetter 3860710f11 [maven-release-plugin] prepare release druid-0.3.26 2013-03-21 13:14:14 -05:00
xvrl 8eec41f934 squigglies ftw 2013-03-20 11:42:17 -07:00
xvrl c68bd66945 add close method to aggregators 2013-03-19 16:03:48 -07:00
Eric Tschetter f47319f118 [maven-release-plugin] prepare for next development iteration 2013-03-18 17:09:01 -05:00
Eric Tschetter 1066144b43 [maven-release-plugin] prepare release druid-0.3.25 2013-03-18 17:08:56 -05:00
Eric Tschetter cba404a65d [maven-release-plugin] prepare for next development iteration 2013-03-18 13:02:40 -05:00
Eric Tschetter 29a0a7e6c6 [maven-release-plugin] prepare release druid-0.3.24 2013-03-18 13:02:33 -05:00
Fangjin Yang b9de751b32 [maven-release-plugin] prepare for next development iteration 2013-03-15 14:32:31 -07:00
Fangjin Yang 57655f19c4 [maven-release-plugin] prepare release druid-0.3.23 2013-03-15 14:32:24 -07:00
Eric Tschetter 7dacf952d6 [maven-release-plugin] prepare for next development iteration 2013-03-15 13:53:39 -05:00
Eric Tschetter ff017fe72a [maven-release-plugin] prepare release druid-0.3.22 2013-03-15 13:53:33 -05:00
Eric Tschetter 39449e6a3e Merge branch 'master' of github.com:metamx/druid 2013-03-14 16:45:54 -05:00
Gian Merlino df8e4d4061 Merge branch 'master' into realtime-index-task 2013-03-13 22:43:01 -07:00
Eric Tschetter 1e0f2c2d92 1) Make log a bit more descriptive 2013-03-13 19:26:22 -05:00
Eric Tschetter 2bd34f1454 [maven-release-plugin] prepare for next development iteration 2013-03-13 18:32:00 -05:00
Eric Tschetter b7960e202d [maven-release-plugin] prepare release druid-0.3.21 2013-03-13 18:31:55 -05:00
Eric Tschetter f1175389c4 [maven-release-plugin] prepare for next development iteration 2013-03-13 16:33:17 -05:00
Eric Tschetter 8aac482618 [maven-release-plugin] prepare release druid-0.3.20 2013-03-13 16:33:10 -05:00
Eric Tschetter b1a559365e Merge branch 'master' of github.com:metamx/druid 2013-03-13 16:29:45 -05:00
Eric Tschetter fa66e1d2cc 1) SQL is hard 2013-03-13 16:29:34 -05:00
Fangjin Yang a49d0c5e4c [maven-release-plugin] prepare for next development iteration 2013-03-11 17:20:16 -07:00
Fangjin Yang 97f828f6b1 [maven-release-plugin] prepare release druid-0.3.19 2013-03-11 17:20:09 -07:00
Gian Merlino 3fa46988f5 Realtime: 
- MetadataUpdater now built from SegmentAnnouncer, SegmentPublisher instances.
- Sinks can take a version instead of always using interval.start. The realtime
  plumber selects a version using a VersioningPolicy.
- Plumbers gained a startJob method.
- Realtime plumbers gained an implementation for finishJob.
 2013-03-11 11:14:51 -07:00
Nelson Ray a470f3fa6a change name of druid.indexer.configTable to druid.database.configTable to be consistent 2013-03-08 10:35:13 -08:00
Eric Tschetter f70f71243d 1) Stop polling in ConfigManager when stop is called 
2) Remove WorkSetupManager in favor of just using ConfigManager
 2013-03-07 17:45:57 -06:00
Eric Tschetter 1c3ef48f34 1) Adjust the Config stuff that WorkerSetupManager was using to be reusable 
2) Use new ConfigManager to pull out a whitelist for the Master
 2013-03-07 17:45:57 -06:00
xvrl 8640342a2f remove antlr from common 2013-03-04 16:44:53 -08:00
xvrl b64118b168 minimal SQL support 2013-03-04 16:44:52 -08:00
Fangjin Yang 552b365194 [maven-release-plugin] prepare for next development iteration 2013-03-04 15:11:37 -08:00
Fangjin Yang fdb3911794 [maven-release-plugin] prepare release druid-0.3.18 2013-03-04 15:11:28 -08:00
Fangjin Yang 91f54a72ee fix broken UT 2013-03-04 15:09:55 -08:00
Fangjin Yang 6977fe03bd [maven-release-plugin] prepare for next development iteration 2013-03-04 13:08:26 -08:00
Fangjin Yang d4f4e41320 [maven-release-plugin] prepare release druid-0.3.16 2013-03-04 13:08:09 -08:00
Fangjin Yang ee38d096c7 [maven-release-plugin] prepare for next development iteration 2013-03-02 09:29:04 -08:00
Fangjin Yang a90d204ba2 [maven-release-plugin] prepare release druid-0.3.15 2013-03-02 09:28:51 -08:00
Fangjin Yang 879b2475d4 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:53:13 -08:00
Fangjin Yang e3ba6efb80 [maven-release-plugin] prepare release druid-0.3.14 2013-03-01 19:53:07 -08:00
Fangjin Yang 7f6747194d [maven-release-plugin] prepare for next development iteration 2013-03-01 19:45:59 -08:00
Fangjin Yang 06a2a3a793 [maven-release-plugin] prepare release druid-0.3.13 2013-03-01 19:45:50 -08:00
Fangjin Yang e0700bb161 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:28:34 -08:00
Fangjin Yang 38c8ffb552 [maven-release-plugin] prepare release druid-0.3.12 2013-03-01 19:28:28 -08:00
Fangjin Yang 49e61d00fd [maven-release-plugin] prepare for next development iteration 2013-03-01 19:05:46 -08:00
Fangjin Yang 7e316e3508 [maven-release-plugin] prepare release druid-0.3.11 2013-03-01 19:05:39 -08:00
Fangjin Yang e2b4163e31 [maven-release-plugin] prepare for next development iteration 2013-03-01 18:24:09 -08:00
Fangjin Yang 023199702e [maven-release-plugin] prepare release druid-0.3.10 2013-03-01 18:24:03 -08:00
Fangjin Yang a574da55ed fix broken UT 2013-03-01 18:22:30 -08:00
Gian Merlino 0092ad7efb [maven-release-plugin] prepare for next development iteration 2013-03-01 16:57:47 -08:00
Gian Merlino 03ff72b7e2 [maven-release-plugin] prepare release druid-0.3.8 2013-03-01 16:57:38 -08:00
Gian Merlino 998ed0a8de [maven-release-plugin] prepare for next development iteration 2013-03-01 14:43:20 -08:00
Gian Merlino 89d5ddf2f7 [maven-release-plugin] prepare release druid-0.3.7 2013-03-01 14:43:13 -08:00
Fangjin Yang 360c6a1df1 [maven-release-plugin] prepare for next development iteration 2013-03-01 13:55:07 -08:00
Fangjin Yang a43dc44ebb [maven-release-plugin] prepare release druid-0.3.6 2013-03-01 13:55:01 -08:00
Fangjin Yang 3264a689f1 [maven-release-plugin] prepare for next development iteration 2013-03-01 11:43:23 -08:00
Fangjin Yang 334fffdef5 [maven-release-plugin] prepare release druid-0.3.5 2013-03-01 11:43:16 -08:00
Gian Merlino f862d9205d Merge branch 'master' into hadoop-index-task 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
 2013-02-27 06:53:06 -08:00
Fangjin Yang 2e1e1753d5 [maven-release-plugin] prepare for next development iteration 2013-02-26 15:15:54 -08:00
Fangjin Yang ab456cf3b1 [maven-release-plugin] prepare release druid-0.3.4 2013-02-26 15:15:36 -08:00
Gian Merlino 14cf506c43 DefaultObjectMapper: Add GuavaModule 2013-02-25 17:05:01 -08:00
Gian Merlino 9964e7dfe4 [maven-release-plugin] prepare for next development iteration 2013-02-25 12:24:24 -08:00
Gian Merlino 99c4f9446c [maven-release-plugin] prepare release druid-0.3.3 2013-02-25 12:24:15 -08:00
Eric Tschetter e0f6df1a5c [maven-release-plugin] prepare for next development iteration 2013-02-21 20:39:50 -06:00
Eric Tschetter 846bc0e4f0 [maven-release-plugin] prepare release druid-0.3.2 2013-02-21 20:39:45 -06:00
Eric Tschetter 699aadd2b1 [maven-release-plugin] prepare for next development iteration 2013-02-21 15:50:01 -06:00
Eric Tschetter 606a2e4b01 [maven-release-plugin] prepare release druid-0.3.1 2013-02-21 15:49:55 -06:00
Eric Tschetter f8c54a72c2 1) Changes to allow for local storage 2013-02-21 15:47:01 -06:00
Eric Tschetter dc3459d3f9 1) Initial commit of refactorings on top of housejester's to simplify the zipping and simplify the creation of other methods of loading data 2013-02-21 15:47:01 -06:00
Deep Ganguli 60da9ffddb Merge branch 'master' into hadoop-index-task 
Conflicts:
	common/src/main/java/com/metamx/druid/utils/JodaUtils.java
	indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java
	indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java
	indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java
 2013-02-15 13:22:31 -08:00
Gian Merlino 824e3c0eb2 [maven-release-plugin] prepare for next development iteration 2013-02-15 13:03:39 -08:00