4971 Commits

Author SHA1 Message Date
Gian Merlino
badc09e85c Disable checkGzExists in the default GzipFilter.
It is unhelpful because we don't actually have any precomputed .gz resources,
and checking for them inside jars is expensive.
2014-12-22 12:45:48 -05:00
xvrl
6ebf0bd62a Merge pull request #986 from metamx/test-timeouts
Set global timeout on tests to avoid false-negatives on slower hardware
2014-12-19 17:27:07 -08:00
Xavier Léauté
27a3169312 increase test timeouts 2014-12-19 17:09:43 -08:00
xvrl
500c809bbe Merge pull request #983 from druid-io/CompressionStrategyTestConcurencyExpansion
Lengthen CompressionStrategyTest::testKnownSizeConcurrency() timeout
2014-12-19 17:01:46 -08:00
xvrl
9f264632f7 Merge pull request #985 from metamx/travis-ci
add travis-ci config
2014-12-19 16:38:54 -08:00
Xavier Léauté
9cf41b022a add travis-ci config 2014-12-19 15:53:19 -08:00
Charles Allen
971afab36f Lengthen CompressionStrategyTest::testKnownSizeConcurrency() to have 2m timeout on its test to account for shared Jenkins build lag 2014-12-19 12:53:20 -08:00
Charles Allen
7c8d4a7433 Use Module instead of generic Object in Guice related items 2014-12-19 10:54:06 -08:00
flow
f13eab644a Keep HdfsTaskLogsConfig creator 2014-12-19 10:48:39 +08:00
xvrl
63df70cbe2 Merge pull request #976 from metamx/deadlockFix
Fix deadlock in DirectDruidClient
2014-12-18 12:03:08 -08:00
flow
a637a23eae fix issue #977 2014-12-18 19:09:13 +08:00
Charles Allen
a0b2a63d7f Fix deadlock in DirectDruidClient 2014-12-16 18:34:30 -08:00
fjy
76cd7e0f56 update druid api 2014-12-16 11:45:48 -08:00
Charles Allen
ee81a29a72 Merge pull request #974 from metamx/fix-log4j
update http client and fix log4j dependencies
2014-12-16 11:37:12 -08:00
fjy
882874ce60 address cr 2014-12-16 11:37:38 -08:00
fjy
b3999bbc6a update http client and fix log4j dependencies 2014-12-16 11:29:50 -08:00
Fangjin Yang
be507b8cb4 Merge pull request #943 from mrijke/partialdimextractfn-nullpointer
Fix NullPointerException in PartialDimExtractionFn
2014-12-16 12:29:27 -07:00
nishantmonu51
80e4b68ee7 review comments 2014-12-16 21:16:48 +05:30
Fangjin Yang
bbbde336eb Merge pull request #973 from metamx/revert-972-revert-837-master
Revert "Revert "Support more AWS credentials providers for S3 storage""
2014-12-15 19:27:38 -07:00
fjy
c0af7b2a5d fix broken ut 2014-12-15 18:29:15 -08:00
Fangjin Yang
d106096327 Revert "Revert "Support more AWS credentials providers for S3 storage"" 2014-12-15 19:27:28 -07:00
Fangjin Yang
761fd54b40 Merge pull request #972 from metamx/revert-837-master
Revert "Support more AWS credentials providers for S3 storage"
2014-12-15 19:16:46 -07:00
Fangjin Yang
714317a492 Revert "Support more AWS credentials providers for S3 storage" 2014-12-15 19:16:37 -07:00
fjy
e9238161cd fix broken test 2014-12-15 18:12:44 -08:00
Fangjin Yang
1089072a73 Merge pull request #971 from metamx/fixBackCompat
Add deprecated smile media type for backwards compatability during upgrades
2014-12-15 19:01:01 -07:00
Charles Allen
242edd14e5 Add deprecated smile media type for backwards compatability during upgrades 2014-12-15 18:00:10 -08:00
Fangjin Yang
feb9b2f5d9 Merge pull request #970 from metamx/log4j
Add log4j in services
2014-12-15 18:45:08 -07:00
Charles Allen
d1fcd4e92e Add log4j in services 2014-12-15 17:39:19 -08:00
fjy
43d27ddaf0 update http client and fix logging 2014-12-15 16:59:57 -08:00
fjy
4f0c0c5ae2 i hate guice 2014-12-15 16:04:19 -08:00
Fangjin Yang
af1185b58c Merge pull request #969 from metamx/fixRemoteLogViewing
Remove try-with-resources for log stream in WokerResource
2014-12-15 16:26:02 -07:00
Charles Allen
54068e8b1d Remove try-with-resources for log stream in WokerResource 2014-12-15 15:24:59 -08:00
fjy
ac407fb6ba clean up defaults 2014-12-15 15:05:02 -08:00
fjy
e872952390 fix working path default bug 2014-12-15 14:51:58 -08:00
Charles Allen
a520835972 Merge pull request #957 from metamx/fix-gzip-encoding
fix gzip compression
2014-12-15 13:20:36 -08:00
Fangjin Yang
eed679a1ba Merge pull request #967 from metamx/more-logs
Add more logs for CIM
2014-12-15 14:20:27 -07:00
Xavier Léauté
e166260f80 more inventory logs 2014-12-15 13:19:47 -08:00
fjy
9c6e32fc3f address cr 2014-12-15 13:06:36 -08:00
fjy
61101bee6c more logs for CIM 2014-12-15 12:57:40 -08:00
Fangjin Yang
b3fe91bb50 Merge pull request #830 from metamx/union-merge-on-historical
Union merge on historical
2014-12-15 13:36:47 -07:00
Fangjin Yang
7487321a22 Merge pull request #837 from gnethercutt/master
Support more AWS credentials providers for S3 storage
2014-12-15 13:36:16 -07:00
Fangjin Yang
31cda0b830 Merge pull request #958 from metamx/fix-router-service-discovery
fix router discovering brokers with default names
2014-12-15 13:35:39 -07:00
Fangjin Yang
335fbebb94 Merge pull request #960 from metamx/new-config
Rewrite config docs for 0.7.x
2014-12-15 13:35:25 -07:00
Fangjin Yang
8a3ce8acd9 Merge pull request #963 from metamx/twitterFirehoseUpdate
Added more Twitter fields to TwitterSpritzerFirehoseFactory
2014-12-15 13:35:15 -07:00
Xavier Léauté
77bf5da317 fix typo 2014-12-15 10:07:51 -08:00
fjy
3cb7999eb9 i hate hadoop dependencies 2014-12-15 09:52:46 -08:00
fjy
56dfe5d883 Merge branch 'master' of github.com:metamx/druid 2014-12-15 09:42:08 -08:00
fjy
88858ea1c3 make default handler service announcing 2014-12-15 09:42:03 -08:00
Charles Allen
bed3e7e1d2 Merge pull request #966 from metamx/fix-tasklog-streaming
fix task log streaming
2014-12-14 09:31:41 -08:00
Xavier Léauté
bd91a40491 fix task log streaming 2014-12-13 15:22:55 -08:00