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

193 Commits

Author SHA1 Message Date
fjy 0c789412bb add a workaround for jackson bug where jacksoninject fails when a null value is passed through json creator annotated constructor 2014-01-25 07:07:27 +08:00
fjy e2ea2ec7fd Merge branch 'master' into az 
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java
 2014-01-20 15:10:13 -08:00
fjy 215584891e Merge branch 'master' into moar-endpoints 2014-01-20 13:06:45 -08:00
fjy 3cba0c8ff2 more endpoints for getting info out of druid 2014-01-17 17:52:27 -08:00
fjy f898c29e20 fix batch indexing and prepare for next release 2014-01-17 15:52:04 -08:00
fjy 0ceda034cd fix dependency issue and prepare for next release 2014-01-14 17:34:02 -08:00
fjy 187bb84b45 prepare for next release 2014-01-14 16:07:05 -08:00
fjy 9184906c39 prepare for next release 2014-01-14 09:54:42 -08:00
fjy e8d61ffe99 prepare for next release 2014-01-13 18:02:24 -08:00
fjy 3b17c4c03c a whole bunch of docs and fixes 2014-01-13 18:01:56 -08:00
fjy f4e3f02c3b more exceptions 2014-01-10 18:06:42 -08:00
Igal Levy 8196bf5dde added link to manually download druid 0.5.x 2014-01-10 17:20:53 -08:00
Igal Levy 58c8fcc519 added note about support for druid 0.5.x only 2014-01-10 16:29:33 -08:00
Igal Levy 917b4ea5ce Merge branch 'master' into igalDruid 2014-01-10 16:19:20 -08:00
fjy fe50104053 fix the index task and more docs 2014-01-10 14:47:18 -08:00
Igal Levy 8c2bffc1a6 final draft 2014-01-10 14:45:38 -08:00
fjy f123a14373 Merge branch 'master' into az 
Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java
 2014-01-09 19:09:38 -08:00
Igal Levy 2ddf3c4ef6 first stab at overhauling this doc to bring it up to date 2014-01-09 15:44:54 -08:00
Xavier Léauté 84273d4fc2 add docs 2014-01-09 15:18:40 -08:00
fjy 81cdf1b6d0 Merge pull request #340 from metamx/igalDruid 
Igal druid
 2014-01-08 18:39:00 -08:00
fjy 96caf2d518 Merge branch 'master' into az 2014-01-08 16:23:05 -08:00
fjy 90f3056fce clean up doc 2014-01-08 16:10:48 -08:00
fjy 50a6839693 inital commit of topNs 2014-01-08 15:51:03 -08:00
fjy e11952f3b6 bridge is kinda working for mastery stuff right now, tests pass 2014-01-06 17:01:50 -08:00
fjy 488a118f3f Merge branch 'master' into az 2014-01-02 10:53:37 -08:00
Igal Levy 5efca6eea8 Merge branch 'master' into igalDruid 2013-12-20 13:45:16 -08:00
Igal Levy 39012c6dbe Separated realitme ingestion from realtime node info; under Data Ingestion the Realtime link now points to the new realtime-ingestion page 2013-12-20 13:43:55 -08:00
Igal Levy 9b53912209 Added titles 2013-12-20 13:42:22 -08:00
Igal Levy 3d66f0fb8b added Realtime-ingestion under Data Ingestion (this is the content split from Realtime, which is now just about the node); moved Firehose and Plumber under Realtime-ingestion 2013-12-20 13:08:25 -08:00
Igal Levy d283693d78 updated links and references since these two files contain the lists of firehoses and plumbers they refer to, and pointed to Realtime-ingestion for the example of the kafka firehose 2013-12-20 13:04:40 -08:00
Gian Merlino bbe1b82347 Update versions 2013-12-20 12:26:27 -08:00
Gian Merlino 4bc8ff4d6a Update versions 2013-12-20 11:19:36 -08:00
Igal Levy 721195ac12 added anchor for linking to section 2013-12-19 17:26:51 -08:00
Igal Levy 18d8b0840e fixed formatting on numbered list and code blocks 2013-12-19 16:07:57 -08:00
Igal Levy 0aa04dd787 added title 2013-12-19 16:04:56 -08:00
Igal Levy 479b953a79 added definitions for master and compute nodes; tweaked spacing between term and definition 2013-12-18 17:35:30 -08:00
fjy 9b8134c73e Merge branch 'master' into az 2013-12-18 15:44:43 -08:00
Gian Merlino fc4dd51194 Update versions 2013-12-18 15:33:25 -08:00
Xavier Léauté 892a42bafe fix docs config casing 2013-12-18 14:37:27 -08:00
fjy d112b2d211 prepare for next release 2013-12-17 17:47:04 -08:00
fjy 07875dd30b prepare for next release 2013-12-17 16:28:11 -08:00
Xavier Léauté 178c26f9f7 fix naming and docs 2013-12-16 16:50:31 -08:00
fjy f2241c8885 prepare for next release 2013-12-16 16:16:00 -08:00
gianm bc4a7349d1 Merge pull request #303 from metamx/s3-storage-archiving 
S3 Storage: moving and archiving of unused segments
 2013-12-16 16:02:18 -08:00
fjy 2c7a6d26b3 fix typo in tutorial 2013-12-16 15:55:28 -08:00
fjy 27bba22e6f make rules assignable across tiers 2013-12-16 15:54:42 -08:00
fjy e309f48357 Merge branch 'master' into az 
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
 2013-12-16 14:57:54 -08:00
Xavier Léauté bb1b037f87 fix docs 2013-12-16 13:59:16 -08:00
Xavier Léauté e38f2877fb default to archiving segments + docs 2013-12-16 13:59:15 -08:00
fjy 2dd4860106 fix typo 2013-12-13 17:08:29 -08:00