fjy
38a369c0ff
fix links and some errors
2014-12-08 16:20:35 -08:00
fjy
28b72a69ad
redocumenting ingestion
2014-12-08 16:15:46 -08:00
Charles Allen
0fbbcd5885
Move some config description from Configuration.md to the Broker and Historical config pages
2014-12-08 15:53:58 -08:00
xvrl
1392e2731f
Merge pull request #936 from metamx/cachingRunnerImprovements
...
General Caching Query Runners cleanup (40% query time reduction for HLL)
2014-12-08 14:07:52 -08:00
Charles Allen
7b65f0635d
General Caching Query Runners cleanup
...
* Add type strictness to CachingClusteredClient.
* Add background caching to CachingClusteredClient. Gives between 0% and 5% query speed increase.
* Add @BackgroundCaching annotation for injected ExecutorService items
* Add `numBackgroundThreads' configuration options to CacheConfig (default 0 aka same thread legacy behavior)
* Add unit tests for CacheConfig
* Add an abstract caching query runner class, currently it doesn't do anything exceppt simply make the two caching queries distinct.
* Add caching to CachingQueryRunner. Gives up to a WHOPPING 40% reduction in query time on HLL queries
* Updated docs with more info on cache settings.
2014-12-08 13:29:32 -08:00
Fangjin Yang
86a837a653
Merge pull request #939 from 7eggs/doc-fixes
...
Fix link to Druid Cluster Tutorial in Booting a Druid Cluster page
2014-12-08 12:10:15 -07:00
Alexander Makarenko
6dfa0d20b8
Fix link to Druid Cluster Tutorial in Booting a Druid Cluster page
2014-12-07 21:59:06 +03:00
Fangjin Yang
1a4e798373
Merge pull request #938 from 7eggs/doc-fixes
...
Broker config small fix
2014-12-07 09:48:53 -07:00
Alexander Makarenko
df5b525097
Broker config small fix
2014-12-07 18:59:22 +03:00
Alexander Makarenko
bbd337235e
Add Node.js client to Community Libraries
2014-12-07 03:51:35 +03:00
fjy
8ee4d12562
Refactor structure for examples and extensions
2014-11-21 14:45:24 -08:00
nishantmonu51
e3260aa177
Filtered Aggregator fixes + enhancements
...
- fix NPE on IncrementIndex
- refactor code to support AND, OR filter
- tests for AND & OR filter
- handling for missing column / null values
2014-11-20 15:17:18 -08:00
nishantmonu51
2f08ab85fc
Revert "update doc"
...
This reverts commit d66d0de54f
.
2014-11-20 10:17:07 +05:30
nishantmonu51
d66d0de54f
update doc
2014-11-20 09:29:26 +05:30
Fangjin Yang
db8a168b91
Merge pull request #881 from mrijke/update-ruleconf-docs
...
Update Rule-Configuration docs: match example with description
2014-11-18 16:41:49 -07:00
Fangjin Yang
87ea6fd377
Merge pull request #878 from metamx/default-extension-version
...
use Druid version as the default version for extensions
2014-11-18 13:56:54 -07:00
Xavier Léauté
bf04ad0eb3
add documentation
2014-11-18 10:50:18 -08:00
Maarten Rijke
06e4535cb8
Update Rule-Configuration: match example with description
...
The example JSON snippets of the 'loadForever' and the 'dropForever' don't match their description, the 'type' description mentions 'loadByInterval' and 'dropByPeriod' respectively.
2014-11-18 17:00:42 +01:00
nishantmonu51
b2e8073c61
document combining firehose
2014-11-18 11:01:08 +05:30
fjy
afd419ea29
fix bugs with docs
2014-11-14 13:25:21 -08:00
Fangjin Yang
d85c172285
Merge pull request #808 from metamx/igalDruid
...
Clarify value types for granularities; link to more ISO info; more info on OrderByColumnSpec
2014-11-14 14:20:37 -07:00
Eric Bouchut
e89f2f973d
Fix typo in DimensionSpecs
2014-11-13 15:35:09 +01:00
Xavier Léauté
ba442b9882
fix default FilteredServerView + batch annoucement
2014-11-12 23:17:16 -08:00
fjy
26b358e127
Merge branch 'master' of github.com:metamx/druid into druid-0.7.x
2014-11-11 17:30:30 -08:00
Igal Levy
de7fb5a690
fixed typo, added note on matching schema requirement for unioned data sources
2014-11-11 11:56:22 -08:00
Igal Levy
34a6f7f7ca
Merge branch 'master' into fix-datasource-doc
2014-11-11 11:55:47 -08:00
fjy
6188315293
Merge branch 'master' into druid-0.7.x
...
Conflicts:
processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java
2014-11-10 14:52:10 -08:00
Igal Levy
03515a4de6
fixes typo
2014-11-07 10:40:46 -08:00
xvrl
18b9c5cd2f
db -> metadata
2014-11-06 21:46:35 -08:00
Igal Levy
20562492de
clarified that dimension and metric can be String too, not just object
2014-11-06 15:16:36 -08:00
Igal Levy
ec0accf0b1
clarified that dimensions and metrics are given in String arrays
2014-11-06 15:13:30 -08:00
Igal Levy
8f0b675e23
Added info to better explain how to use pagingSpec
2014-11-06 14:50:01 -08:00
Igal Levy
5a98fcf5b9
typo: s/metric_value/metric_name/ and added quotes
2014-11-06 11:18:30 -08:00
Igal Levy
73226f20cc
typo: s/metric_value/metric_name/
2014-11-06 11:01:31 -08:00
Igal Levy
81227b63a7
Merge branch 'master' into fix-query-docs
2014-11-04 11:09:13 -08:00
xvrl
2c62b9e6e3
Merge pull request #821 from metamx/minor-fix
...
Some minor fixes in docs and change jetty defaults
2014-11-04 10:18:57 -08:00
fjy
42cf20c9f1
some minor fixes in docs and change jetty defaults
2014-11-04 10:08:50 -08:00
Xavier Léauté
f56d026d7d
fix realtime module + cleaner metadata abstraction
...
- better metadata abstractions
- more db->metadata renaming
2014-11-03 16:40:23 -08:00
Igal Levy
c58fc503d9
Clarified sort as optional, object
2014-11-03 11:59:04 -08:00
Igal Levy
b416c3ff5c
added quotes to clarify string value; added example of numeric filter
2014-11-03 11:57:52 -08:00
Xavier Léauté
48e6bef250
update documentation with new property names
2014-11-03 09:25:39 -08:00
Igal Levy
e07b02f54b
fixed typo and added info that union can take any number of dataSources
2014-10-31 11:07:55 -07:00
Igal Levy
0906b21079
Merge branch 'master' into fix-datasource-doc
2014-10-30 16:26:16 -07:00
Igal Levy
479c196aa4
Added section on union data sources
2014-10-29 12:32:24 -07:00
Igal Levy
23315e298d
expanded and clarified OrderByColumnSpec section
2014-10-28 10:38:21 -07:00
Xavier Léauté
575919ec6c
provide a little more involved example
2014-10-27 19:18:09 -07:00
Igal Levy
f62221bfae
added link to DimensionSpec for alternative way to provide dimensions
2014-10-23 14:30:02 -07:00
Igal Levy
f76d68e2c9
added missing anchor to fix broken internal link
2014-10-23 12:49:44 -07:00
Igal Levy
374ba8ab5e
minor edits based on Vad's feedback
2014-10-23 11:38:01 -07:00
fjy
d76d57d95d
update docs
2014-10-22 16:16:28 -07:00
nishantmonu51
0785baf54c
review comments
2014-10-22 21:28:31 +05:30
nishantmonu51
6cb6ec39cf
add support for not filter and add test
2014-10-22 10:25:24 +05:30
Xavier Léauté
34f2c74331
add docs
2014-10-21 17:24:44 -07:00
fjy
ee392b6064
more updates to docs
2014-10-21 16:26:17 -07:00
fjy
2d96bc5f1f
more FAQ docs
2014-10-21 16:08:56 -07:00
Fangjin Yang
5df92aff2c
Merge pull request #797 from metamx/igalDruid
...
Igal druid
2014-10-21 16:47:47 -06:00
Xavier Léauté
9d5e65913d
fix serde
2014-10-21 15:05:08 -07:00
Xavier Léauté
b32ce31eff
add documentation
2014-10-20 14:12:30 -07:00
Igal Levy
1dd9aeba4f
removed link with no target
2014-10-19 21:22:10 -07:00
Igal Levy
b7c4983a91
added syntax highlighting
2014-10-19 18:38:20 -07:00
Igal Levy
63a4f2dc05
fixed broken internal link
2014-10-19 18:29:34 -07:00
Fangjin Yang
82fc6e5358
Merge pull request #793 from metamx/partitions-docs
...
New PartitionsSpec docs.
2014-10-19 15:33:16 -06:00
Gian Merlino
20d29666af
New PartitionsSpec docs.
2014-10-16 13:17:13 -07:00
fjy
35716e8dee
add a best practices doc
2014-10-13 14:33:45 -07:00
fjy
d4f5a71ded
prepare for next release
2014-10-13 12:48:12 -07:00
Xavier Léauté
8304365948
move thanks page to main site
2014-10-10 10:19:33 -07:00
fjy
0532208c25
prepare for next release
2014-10-09 14:21:38 -07:00
Xavier Léauté
fa27908ae4
and another one, fixes #782
2014-10-09 10:28:33 -07:00
Xavier Léauté
e2e912cdc3
fix broken link, resolved #782
2014-10-09 10:26:47 -07:00
fjy
21ac3f2aab
slight clarification about hadoop setup
2014-10-08 10:56:00 -07:00
fjy
8a34a55c0b
add example hadoop config
2014-10-08 10:51:00 -07:00
fjy
1ce67dcfc4
prepare for next release
2014-10-07 14:27:47 -07:00
fjy
19dc32d314
add headers for druid vs pages
2014-10-07 13:50:32 -07:00
fjy
f1d37d569c
doc fixes
2014-10-07 13:01:41 -07:00
fjy
ee0e856029
correct mistakes
2014-10-06 14:23:23 -07:00
fjy
546fca2d67
docs for router node
2014-10-06 14:18:25 -07:00
fjy
d9453f29f1
fix docs
2014-09-30 15:02:06 -07:00
fjy
5b166134fb
add docs
2014-09-30 14:59:02 -07:00
fjy
e367f76824
Merge pull request #757 from pdeva/master
...
FAQ on changing data granularity
2014-09-29 15:40:37 -06:00
pdeva
bc66b42acc
FAQ on changing data granularity
...
added cause this question is asked a ton of times on google group and i had a similar question and had to resort to the forums cause there was no doc.
2014-09-25 01:48:45 -07:00
Xavier Léauté
13ac7de882
update doc versions
2014-09-23 16:28:18 -07:00
fjy
c042ce5b4b
prep next rel
2014-09-23 16:10:12 -07:00
fjy
d19723e186
Merge pull request #749 from metamx/background-segment-announcing
...
Parallelize segment loading + background announcing
2014-09-23 17:07:51 -06:00
fjy
bdea4f45ea
fixes #733
2014-09-23 15:41:56 -07:00
Xavier Léauté
d7b39fa7ea
add documentation
2014-09-23 09:30:40 -07:00
xvrl
5e0b6b9896
Merge pull request #746 from pdeva/master
...
segment metadata result explained better
2014-09-22 10:27:35 -07:00
Xavier Léauté
815ebeee25
add docs for background segments loading
2014-09-18 12:09:20 -07:00
pdeva
d53ccf7ead
segment metadata result explained better
2014-09-16 15:56:15 -07:00
fjy
fbeb57d261
prepare for next release
2014-09-16 15:18:27 -07:00
fjy
c1a0961f98
Merge pull request #731 from pdeva/master
...
Corrected documentation for IngestSegmentFirehose
2014-09-16 10:54:29 -06:00
pdeva
d674e611de
described how to enable experimental features
2014-09-15 14:41:57 -07:00
pdeva
4a23cd94ef
Corrected documentation for IngestSegmentFirehose
...
Ingest Segment firehose had incorrect documentation.
2014-09-14 11:22:36 -07:00
Xavier Léauté
958f2f9abd
fix docs versions
2014-09-05 11:40:51 -07:00
fjy
eecda34940
fix tutorial with msg that no longer exists
2014-09-05 10:15:37 -07:00
Xavier Léauté
3c131f4d13
update version in docs
2014-09-04 13:47:25 -07:00
fjy
6e75cb755d
Merge pull request #719 from pdeva/master
...
clarify division operation in post aggregation
2014-09-04 11:26:42 -06:00
Xavier Léauté
23a2b84703
fix broken link, resolves #718
2014-08-31 21:51:12 +00:00
pdeva
1bad66c16d
clarify division operation in post aggregation
2014-08-31 09:56:15 -07:00
Xavier Léauté
6f45f88f26
fix post-aggregations broken link
2014-08-29 16:39:09 -07:00
pdeva
7c47c60c4b
explain what 'full cluster view' means
2014-08-26 03:02:05 -07:00
fjy
7ca3b2d27c
update docs
2014-08-22 08:26:25 -07:00
fjy
85ff054726
prepare for next release
2014-08-21 12:47:55 -07:00
fjy
29d14b772f
prepare for next release
2014-08-14 14:56:27 -07:00
Amy Troschinetz
71b8db631c
Updates Cassandra example documentation.
...
Updates the required properties to enable Cassandra as deep storage.
Also adds more information about how to create the required keystore,
and which properties files need to be modified to support Cassandra.
Also adds syntax highlighting to the provided example code.
Additionally, moves Cassandra Deep Storage documentation out into the
actual documentation hierarchy with appropriate linkage. A stub
README.md is left in the example directory to provide a useful landing
page for existing weblinks to the original documentation.
2014-08-14 16:36:36 -05:00
fjy
79f6486b88
prepare for next release
2014-08-12 13:22:23 -07:00
fjy
d4014c6a4e
Merge pull request #675 from metamx/slimmer-column-cache
...
reduce object count overhead of column cache
2014-08-12 14:16:33 -06:00
Xavier Léauté
1c244c8be8
add column cache docs
2014-08-12 10:40:09 -07:00
fjy
bd98e0dd29
prep next release
2014-08-09 19:33:31 -07:00
fjy
8998700760
prepare for next release
2014-08-08 16:19:45 -07:00
fjy
8e87cae990
prepare for next rel
2014-08-08 15:51:22 -07:00
fjy
35937132a7
prep next release
2014-08-08 14:35:22 -07:00
fjy
bb44056810
prepare for next release
2014-08-08 11:38:17 -07:00
fjy
57a979ef19
prepare for next release
2014-08-06 13:31:27 -07:00
Gian Merlino
6e33cd4e0a
Coordinator drop/remove related stuff.
...
- DruidCoordinatorCleanup should wait for availableSegments to populate
before dropping any segments.
- Clarify that millisToWaitBeforeDeleting applies to "removing" rather than
"dropping" segments.
- LoadRule shouldn't need to wait for the deletionWaitTime before dropping
excess replicas.
2014-08-06 12:52:09 -07:00
Xavier Léauté
91fc5fc82d
reformatting
2014-08-01 15:28:13 -07:00
Xavier Léauté
e158aa30a7
add timeboundary docs
2014-08-01 10:44:45 -07:00
fjy
362be7a2c0
prepare for next release
2014-08-01 10:12:03 -07:00
fjy
046e8864b1
more docs
2014-08-01 10:10:23 -07:00
Xavier Léauté
b44546ad8c
query cancellation/timeout docs + missing items
2014-08-01 09:48:06 -07:00
fjy
90ebeaa8d3
fix broken approx histo doc
2014-08-01 09:42:52 -07:00
nishantmonu51
80a4f7c5b5
doc for IngestSegmentFirehose
2014-08-01 16:43:39 +05:30
fjy
d202eae3b5
toc fix
2014-07-31 17:27:16 -07:00
fjy
611dcb9d1c
new docs on logging
...
Conflicts:
docs/content/toc.textile
2014-07-31 17:26:15 -07:00
fjy
17c600c691
some doc fixes
2014-07-31 17:25:30 -07:00
fjy
e5ce9b4a2a
prepare for next release
2014-07-31 14:05:56 -07:00
fjy
32bd7003ec
minor doc fix
2014-07-31 12:58:19 -07:00
fjy
147f5754da
add missing doc
2014-07-31 10:23:48 -07:00
fjy
625377fdd2
prep next rel
2014-07-29 22:00:11 -07:00
fjy
7803ca07e7
fix broken chat handler
2014-07-29 17:58:21 -07:00
fjy
89149b5fcb
prepare for next release
2014-07-29 17:38:19 -07:00
fjy
0be5d27f2a
another docs fix
2014-07-29 11:40:35 -07:00
fjy
d9c9190e2f
fix breakage in batch ingestion schema
2014-07-29 11:36:29 -07:00
Jasmine Hegman
1844bf4f08
Adding a section to detail supporting Kafka 8
2014-07-28 14:46:39 -07:00
Jasmine Hegman
61af84a4a1
Cleaning up code sample indentations
2014-07-28 14:44:59 -07:00
fjy
45e443bedb
a few slight tweaks and bumping up curator version
2014-07-25 16:07:40 -07:00
fjy
7e0fa6fe06
Merge branch 'master' of github.com:metamx/druid
2014-07-25 10:50:47 -07:00
fjy
bb5c5b3ce7
fix config with broker select and add docs
2014-07-25 10:50:41 -07:00
fjy
41770574f9
Merge pull request #646 from metamx/inverted-topn-metric-spec-docs
...
add docs
2014-07-25 10:30:38 -06:00
fjy
d3b920769d
a few more cleanups to docs
2014-07-25 09:26:44 -07:00
Xavier Léauté
9c36014645
remove css from docs
2014-07-24 14:41:45 -07:00
Gian Merlino
baeb93772d
Rename OrderBy to LimitSpec in docs.
2014-07-24 14:20:43 -07:00
nishantmonu51
27cda43d89
add docs
...
doc for inverted topN metric spec
2014-07-24 13:16:44 +05:30
fjy
387350abd8
fix toc entry
2014-07-23 13:41:14 -07:00
fjy
ded83557dd
Merge pull request #640 from metamx/disable-worker
...
An alternative way to disable middlemanagers based on worker version
2014-07-17 19:07:27 -06:00
fjy
83cb7931ac
add more stuff to docs
2014-07-17 14:59:56 -07:00
fjy
d765ff5e75
docs for updating
2014-07-17 14:53:26 -07:00
fjy
bb5598df54
fix doc
2014-07-17 14:07:12 -07:00
fjy
c6078ca841
address code review
2014-07-17 13:34:05 -07:00
fjy
bdfeccd092
doc and timeout fix
2014-07-15 15:57:58 -07:00
fjy
ce478be899
Remove redundant forking task runner config
2014-07-07 18:08:37 -06:00
fjy
c646648319
fix examples start port
2014-07-02 10:07:04 -07:00
fjy
dba7e972d8
refactor docs for histograms
2014-07-01 16:39:24 -07:00
Xavier Léauté
70ae6e1fcd
Approximate Histogram Module
2014-07-01 15:10:23 -07:00
fjy
484b91db5a
Merge pull request #617 from metamx/igalDruid
...
Igal druid
2014-06-30 19:58:38 -06:00
Gian Merlino
991ff34f38
More explicit example of jobProperties.
2014-06-25 20:24:51 -07:00
fjy
ff00b545bc
Merge pull request #623 from metamx/document-hadoop-jobProperties
...
Document how to set hadoop properties
2014-06-25 21:15:21 -06:00
Gian Merlino
a7ef019b22
Document batch ingestion jobProperties.
2014-06-25 20:14:11 -07:00
Igal Levy
805e80c24d
Merge branch 'master' into igalDruid
2014-06-20 17:16:41 -07:00
Igal Levy
262d43ae2e
removed build section that didn't work (direct from whirr repo); added info on resource files needed to run test; tweaked whirr config section to match current requirements; changed cluster-start section to reflect fact that we're starting multiple instances; other minor edits
2014-06-20 17:03:21 -07:00
fjy
5afcb9cbd3
add docs
2014-06-19 16:55:02 -07:00
fjy
276e48e564
another doc fix
2014-06-19 13:33:16 -07:00
fjy
fdb39d57a3
fix another doc problem
2014-06-19 13:10:08 -07:00
fjy
9aa018925d
fix doc header
2014-06-19 12:59:58 -07:00
fjy
f1759b450c
fix Zk setup problem
2014-06-19 12:55:02 -07:00
Gian Merlino
3164228ecf
Fix example middle manager configs.
2014-06-19 12:43:42 -07:00
Gian Merlino
eab9381ba1
Docs for string-based EC2 userData.
2014-06-18 10:09:07 -07:00
Gian Merlino
e9ef1e956c
Docs for defaultHadoopCoordinates.
2014-06-18 09:50:37 -07:00
fjy
1110b34328
Merge pull request #586 from metamx/jisoo
...
modify whirr documentation
2014-06-06 16:14:48 -06:00
jisookim0513
11f07b5fbf
revert changes to wikipedia_realtime_task.json, CliBroker.java, CliHistorical.java
2014-06-05 17:51:58 -07:00
jisookim0513
a0d51a8cb2
modify whirr documentation
2014-06-05 15:51:23 -07:00
fjy
c8689507c8
prepare for next release
2014-06-05 10:01:25 -07:00
fjy
e3941a2890
prepare for next rel
2014-06-04 20:19:50 -07:00
fjy
612624fb89
prepare for next release
2014-06-04 16:47:54 -07:00
fjy
8f657686c5
fix typos
2014-06-04 10:14:39 -07:00
fjy
22c62cc176
update performance FAQ
2014-06-04 10:09:17 -07:00
fjy
22bbe037a7
prepare for next release
2014-06-04 09:34:29 -07:00
fjy
dd76fc49e2
fix doc mistake
2014-06-02 15:38:25 -07:00
fjy
abe26a7f2e
change default merge size to 500mb instead of 1g
2014-06-02 12:48:57 -07:00
fjy
abac529116
prepare for next release
2014-06-02 10:49:54 -07:00
fjy
34d3eb3b5f
fix minor link problem in docs
2014-06-02 10:21:00 -07:00
fjy
49f03b808d
fix default value for max segments to merge
2014-06-02 10:20:13 -07:00
fjy
9adf80da7c
prepare for next release
2014-05-29 17:24:02 -07:00
fjy
53638a74ec
add more segment metadata docs
2014-05-29 12:53:13 -07:00
fjy
fcc9bf4f26
document limitspec in groupby, fixes #394
2014-05-29 10:19:11 -07:00
fjy
7be93a770a
make all firehoses work with tasks, add a lot more documentation about configuration
2014-05-28 16:33:59 -07:00
fjy
002fefb4cf
Merge pull request #554 from jcollum/kafka-404-fix
...
changed the url for kafka wget (old one was 404)
2014-05-19 14:37:20 -06:00
Justin Collum
d3d2534105
changed the url for kafka wget (old one was 404)
2014-05-19 10:55:22 -07:00
fjy
b6fb4245aa
Merge branch 'master' into new-schema
...
Conflicts:
indexing-hadoop/src/main/java/io/druid/indexer/HadoopDriverConfig.java
indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfigBuilder.java
pom.xml
server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java
2014-05-06 14:32:51 -07:00
fjy
b1bd6eb0f2
Merge pull request #512 from metamx/cardinality
...
Cardinality aggregator
2014-05-05 17:10:24 -06:00
fjy
8af927e2a7
Merge pull request #516 from metamx/alphanumeric-topn
...
Alpha-numeric sorting for topN
2014-05-05 17:09:24 -06:00
fjy
b8184821b5
update docs for next rel
2014-05-01 15:07:14 -07:00
fjy
268c9aa807
update docs version
2014-04-30 13:11:46 -07:00
fjy
3fd651c235
fix the rule again, update docs, and prepare for next release
2014-04-30 10:43:30 -07:00
fjy
0790303b4a
update docs and prepare for next release
2014-04-30 10:23:35 -07:00
fjy
ffd37bc7bd
Merge pull request #521 from metamx/igalDruid
...
Igal druid
2014-04-29 18:06:30 -06:00
Igal Levy
7cd2f9a9bb
fixed couple of typos
2014-04-29 10:00:28 -07:00
Igal Levy
77fb424034
fixed borked description of whirr.hardware-id
2014-04-29 09:56:00 -07:00
Xavier Léauté
fc874f8bbb
add docs
2014-04-28 09:51:58 -07:00
fjy
76e0a48527
Merge branch 'master' into new-schema
...
Conflicts:
indexing-hadoop/src/main/java/io/druid/indexer/DbUpdaterJob.java
indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-04-25 14:03:28 -07:00
Xavier Léauté
42c4e955fa
cosmetic changes
2014-04-25 13:26:11 -07:00