4756 Commits

Author SHA1 Message Date
xvrl
63df70cbe2 Merge pull request #976 from metamx/deadlockFix
Fix deadlock in DirectDruidClient
2014-12-18 12:03:08 -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
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
Charles Allen
225a039a01 Merge pull request #965 from metamx/doc-fix
Fix documented default value for druid.coordinator.merge.on.
2014-12-13 11:13:14 -08:00
Gian Merlino
020f8653f0 Fix documented default value for druid.coordinator.merge.on. 2014-12-13 08:03:09 -08:00
Charles Allen
3c33118f3a Merge pull request #962 from metamx/add-broker-loadstatus
add loadstatus endpoint for serverView status
2014-12-12 17:13:48 -08:00
Charles Allen
e7222c6429 Merge pull request #964 from metamx/fix-index-task-tmpdir
fix IndexTaskTest temp dir
2014-12-12 17:13:27 -08:00
Xavier Léauté
092dfe0309 fix IndexTaskTest tmp dir
- Create local firehose files in a clean temp directory to avoid
firehose reading other random temp files that start with 'druid'
2014-12-12 17:05:45 -08:00
Charles Allen
687c82daa8 Added more Twitter fields to TwitterSpritzerFirehoseFactory
* Now with GEOGRAPHY support!
2014-12-12 15:27:00 -08:00
xvrl
fc7f1e6975 Merge pull request #932 from metamx/directDruidClientSpeedupRebase
Replace AppendableByteArrayInputStream in DirectDruidClient
2014-12-12 14:44:36 -08:00
Charles Allen
ca8300a461 Replace AppendableByteArrayInputStream in DirectDruidClient
* Replace with SequenceInputStream fueled by an enumeration of ChannelBufferInputStream which directly wrap the response context ChannelBuffer
* Added zero-length byte array when DirectDruidClient is done. This prevents an odd race condition on `done`.
2014-12-12 14:01:13 -08:00
Xavier Léauté
4b5282d224 add loadstatus endpoint for serverView status 2014-12-12 13:18:31 -08:00
Fangjin Yang
016d07fda3 Merge pull request #961 from metamx/fixTwitter
Fix the twitter firehose
2014-12-12 12:17:23 -07:00
Charles Allen
92ea82da6d Fix the twitter firehose
* It was missing some json annotations
2014-12-11 16:19:47 -08:00