Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,628 Commits 111 Branches 503 Tags 726 MiB
Commit Graph

2323 Commits

Author SHA1 Message Date
nishantmonu51 3b894f9fb9 add ut for TierSelectorStrategies 
fix test
 2015-03-24 08:18:28 +05:30
Xavier Léauté 23528299c9 Merge pull request #1235 from druid-io/comments-update 
Minor update to zk comments to make it more clear what is happening
 2015-03-23 14:02:08 -07:00
fjy a0ce1caaf8 minor update to zk comments to make it more clear what is happening 2015-03-23 11:47:43 -07:00
Himanshu Gupta b5b32dbcb4 in test explicitly setting maxThreads for ProxyServlet to work around https://tickets.puppetlabs.com/browse/TK-152 2015-03-23 12:27:19 -05:00
fjy b389cfe404 [maven-release-plugin] prepare for next development iteration 2015-03-19 12:38:17 -07:00
fjy 60e7d543cc [maven-release-plugin] prepare release druid-0.7.1-rc1 2015-03-19 12:38:13 -07:00
nishantmonu51 21cd75bcf6 improve alert 
skip doing false alert when the coordinator looses leadership
 2015-03-18 09:42:22 +05:30
Fangjin Yang 8d0dfd9af1 Merge pull request #1221 from metamx/AnnounceIdUUID 
Change announcement ID to a UUID instead of Timestamp
 2015-03-17 15:38:53 -07:00
Charles Allen 79b1443cc3 Change announcement ID to a UUID instead of Timestamp 
* Also add a UUIDUtils to the common package
 2015-03-17 15:34:04 -07:00
nishantmonu51 f9821d242f also log author ip address in audit log 2015-03-17 23:15:15 +05:30
cheddar 526a386f50 Merge pull request #1193 from metamx/reduce-test-verbosity 
move test output to file for cleaner build logs
 2015-03-12 15:42:34 -07:00
nishantmonu51 3ec4a30ab5 initial commit 
review comments

more refactoring and cleaning of redundant code

add UT + docs + more refactoring

fixes + review comments

more cleanup

end points to fetch history

review comments

remove unnecessary changes

review comments rename header name

review comments + add test for MetadataRulesManager

review comments docs
 2015-03-12 22:50:29 +05:30
Xavier Léauté fc613771d2 move test output to file for cleaner build logs 
- removes the need for special test log4j2.xml
 2015-03-11 17:56:19 -07:00
Xavier Léauté 9f242ed1ba Merge pull request #1182 from druid-io/better-docs 
Rework the druid docs and fix many mistakes
 2015-03-10 14:23:38 -07:00
fjy 064d65a009 rework the druid docs and fix many mistakes 2015-03-10 14:19:19 -07:00
Xavier Léauté ef842b2eae add test coverage 2015-03-09 14:32:13 -07:00
Xavier Léauté e161021902 Merge pull request #1171 from druid-io/fix-rt-task 
Add more metrics and fail when realtime tasks fail to persist and merge
 2015-03-06 16:42:23 -08:00
fjy 86a0a3cab8 add more metrics and fail when realtime tasks fail to persist and merge 2015-03-06 11:00:34 -08:00
Himanshu Gupta 956361dbbd Refactoring: Moved BaseJettyServerInitializer.java to JettyServerInitUtils.java and changed it from abstract class to a utils class containing static methods 
And, moved jetty stuff to its own package io.druid.server.initialization.jetty
 2015-03-05 19:33:27 -06:00
Himanshu Gupta a8648d8f3d feature to add servlet filters in a druid node via extension modules 2015-03-03 22:35:02 -06:00
Fangjin Yang d8e199a3f5 Merge pull request #1161 from himanshug/zk_ood_updates 
Fix to maintain correctness when out-of-order ZK updates are received
 2015-03-03 14:42:31 -08:00
Himanshu Gupta dda2a62ff5 on receiving ZK ADD/UPDATE events, get latest data from zookeeper instead of taking it from the event which might be stale due to event coming out of order etc 2015-03-03 16:21:56 -06:00
Fangjin Yang 9578304d6f Merge pull request #1130 from housejester/jde-building 
Various improvements to the tutorial and building experience.
 2015-03-02 14:48:32 -08:00
Fangjin Yang e8605c63a9 Merge pull request #1150 from himanshug/broker-parallel-chunk-process 
interval chunk query runner now processes individual chunk in a threadpool
 2015-03-02 13:50:23 -08:00
Himanshu Gupta 29039fd541 interval chunk query runner now processes individual chunk in a thread pool and prints metrics query/time per chunk 2015-03-02 15:45:09 -06:00
Fangjin Yang a76a24742b Merge pull request #1149 from himanshug/broker-get-datasource-update 
updating ClientInfoResource.getDatasource() with a full flag
 2015-03-02 13:28:27 -08:00
Himanshu Gupta a39f4f8bf4 updating ClientInfoResource.getDatasource() with a full flag to return all the served intervals for given data source along with the dimension and metric information 2015-03-02 14:18:52 -06:00
Xavier Léauté 17743b94f3 Cleanup router servlet + tests for gzip proxying 
- Uses method overrides instead of modified Jetty code, now that
  ProxyServlet provides enough method hooks for proper overrides.
  This means we may also benefit from any Jetty ProxyServlet fixes
- Adds test for async proxy servlet to make sure gzip encoding is
  properly proxied.
- Router now proxies POST requests for requests that are not Druid
  queries, by only treating /druid/v2/* endpoints as queries.
 2015-03-02 11:36:15 -08:00
Fangjin Yang c21086b6a8 Merge pull request #1113 from metamx/fix1111 
Make Realtime queries not submit to thread pools for the master merger
 2015-02-27 11:13:25 -08:00
James Estes 9cb5d9bd00 Various improvements to the tutorial and building experience. 
- Improve geo ip download stability
- Retry default geo ip download if corrupt
- Clarify docs on building & where to get artifact
 2015-02-25 18:49:16 -07:00
Xavier Léauté b633111c76 Merge pull request #1156 from druid-io/fix-log 
Print better messages when there are problems with ingestion
 2015-02-25 17:02:46 -08:00
fjy 9a3ed353dc Have a more meaningful message when events are dropped or unparseable 2015-02-25 16:59:46 -08:00
Himanshu Gupta 2192d0cb57 UTs for server 2015-02-25 15:45:58 -08:00
Xavier Léauté 69ba802abb Merge pull request #1109 from metamx/fixAnnouncerTest 
Make the Announcer closing and unannouncing atomic.
 2015-02-25 15:24:18 -08:00
Xavier Léauté aa9dbb773d Merge pull request #1153 from metamx/announcerTestForWaitingFix 
Use forWaiting() in AnnouncerTest
 2015-02-24 21:48:54 -08:00
Charles Allen 29a3522708 Use forWaiting() in AnnouncerTest 
* Helps reduce random failures in unit test on slow systems
 2015-02-24 08:35:07 -08:00
Xavier Léauté b167dcf82c [maven-release-plugin] prepare for next development iteration 2015-02-23 14:28:06 -08:00
Xavier Léauté e81ac2ba43 [maven-release-plugin] prepare release druid-0.7.0 2015-02-23 14:27:58 -08:00
Fangjin Yang 25db9abb7f Merge pull request #1138 from metamx/better-default-hostname 
Better default hostname
 2015-02-18 17:37:34 -08:00
Xavier Léauté 53d2b961c5 default to canonical hostname instead of localhost 2015-02-18 16:44:48 -08:00
fjy 3fab045b2d Go through and fix mistakes in tutorials and docs 2015-02-17 15:21:16 -08:00
cheddar 2a45501393 Merge pull request #1110 from metamx/move-to-sonatype 
Move Druid release artifacts to Sonatype
 2015-02-17 11:54:16 -08:00
extpvaan b42b41cca7 Bind value of column "partitioned" as boolean, as it is defined in the "create table" ddl. 2015-02-17 10:22:10 -08:00
Fangjin Yang 2593864c52 Merge pull request #1126 from gianm/md-insert-or-update-tx 
Use jdbi inTransaction for SQLMetadataConnector's insertOrUpdate.
 2015-02-16 08:23:05 -08:00
Gian Merlino e00de8c19f Use jdbi inTransaction for SQLMetadataConnector's insertOrUpdate. 
This fixes an issue where failed transactions were not properly rolled back.
 2015-02-16 07:42:43 -08:00
Xavier Léauté 78df7f6165 Move Druid release artifacts to Sonatype 
- Switch to using Druid parent POM
- Add required fields for Sonatype
- Common plugin versions and settings have been moved to the parent pom
- Cleanup artifacts and POMs for consistent formatting
- Remove org.hyperic.sigar dependency and update docs to reflect necessary jars to add at runtime when sigar is needed
 2015-02-13 14:26:31 -08:00
fjy d29740ed9f [maven-release-plugin] prepare for next development iteration 2015-02-12 16:16:00 -08:00
fjy 211fd15b7e [maven-release-plugin] prepare release druid-0.7.0-rc3 2015-02-12 16:15:56 -08:00
Fangjin Yang 90bc62eb5c Merge pull request #1108 from metamx/improve-groupby-perf 
Improve groupby by removing conversion to case insensitive row
 2015-02-12 11:45:20 -08:00
Charles Allen bd500fcf4b Make the Announcer closing and unannouncing atomic. 2015-02-11 19:47:04 -08:00
Charles Allen e116600c7f Make Realtime queries not submit to thread pools for the master merger 
Fix https://github.com/druid-io/druid/issues/1111
 2015-02-11 15:47:40 -08:00
nishantmonu51 15cf432b74 remove conversion to case insensitive row 
this is not required after death to casing in 0.7
 2015-02-11 19:40:36 +05:30
Charles Allen d51b37cfd5 Remove QueryResource's ObjectMapper::copy() in favor of using the injected ObjectMapper directly 
* Workaround for https://github.com/FasterXML/jackson-databind/issues/696
 2015-02-10 16:50:23 -08:00
Xavier Léauté 31e248736d Merge pull request #1106 from druid-io/update-http-client 
Update http client to 1.0.0
 2015-02-10 13:37:27 -08:00
fjy 708759e1e0 Update http-client to 1.0.0 2015-02-10 13:36:47 -08:00
Fangjin Yang 1418cbb0e9 Merge pull request #1103 from metamx/fix-request-time 
fix change in request/time meaning introduced by d2c729a, fixes #1102
 2015-02-09 17:23:05 -08:00
Xavier Léauté 2db3144f04 fix change in request/time meaning introduced by d2c729a, fixed #1102 2015-02-09 16:41:30 -08:00
Fangjin Yang 040e771da2 Merge pull request #1099 from metamx/console_cleanup 
console cleanup
 2015-02-08 09:06:05 -08:00
Tarek Rached f47f0d51c7 removed unecessary logging 
fixed simplifyInterval logic
 2015-02-06 21:13:25 -08:00
Tarek Rached a0fc20fc09 better regex for durations 2015-02-06 17:02:31 -08:00
Tarek Rached dae91e5894 fixed links back to old console 2015-02-04 14:21:46 -08:00
fjy 1f12c5b2f1 [maven-release-plugin] prepare for next development iteration 2015-02-03 12:06:49 -08:00
fjy e82d431be7 [maven-release-plugin] prepare release druid-0.7.0-rc2 2015-02-03 12:06:41 -08:00
Xavier Léauté 4eff269536 Merge pull request #1079 from druid-io/cleanup-deps 
Remove non friendly dependencies from Druid
 2015-02-03 11:56:41 -08:00
Xavier Léauté ffb180e29d Merge pull request #1080 from metamx/fix-cost-balancer-strategy 
fix integer value overflow and add test
 2015-02-03 11:45:03 -08:00
nishantmonu51 6da6b9eeda fix integer value overflow and add test 2015-02-03 11:39:30 -08:00
fjy 3e5d338c8e Remove non friendly dependencies from Druid 2015-02-03 11:36:08 -08:00
Eric Tschetter 42eba986ce Towards consistent null handling 
This commit also includes
1) the addition of a context parameter on timeseries queries that allows it to ignore empty buckets instead of generating results for them
2) A cleanup of an unused method on an interface
 2015-02-02 12:53:07 -08:00
Fangjin Yang 92e616de11 Merge pull request #1077 from metamx/remove-unused-imports 
remove unused imports
 2015-02-02 10:45:27 -08:00
nishantmonu51 ba932bb1f2 remove unused imports 2015-02-02 21:53:39 +05:30
fjy d05032b98a towards a community led druid 2015-01-31 20:57:36 -08:00
Fangjin Yang b94b24c46e Merge pull request #1072 from metamx/common-aws-config 
Common AWS module + consistent credential chain for both S3 and auto-scaling
 2015-01-30 14:41:24 -08:00
Fangjin Yang 14837d7808 Merge pull request #1075 from metamx/fix-test-timeout 
increase test timeouts on DruidClusterBridgeTest
 2015-01-30 14:31:32 -08:00
Xavier Léauté cd7e768640 increase test timeouts on DruidClusterBridgeTest 2015-01-30 13:18:35 -08:00
fjy bc1405bee0 fix worker status path announcement with indexer zk config 2015-01-30 12:26:08 -08:00
Xavier Léauté f00872c41b move common AWS related classes into a separate module 2015-01-29 13:55:49 -08:00
Fangjin Yang 2d96b62e6c Merge pull request #1066 from metamx/fix-background-caching-ordering 
fix background caching not preserving result order
 2015-01-28 06:09:17 +08:00
Xavier Léauté 59c1907322 add test for out-of-order background-caching execution 2015-01-27 13:38:08 -08:00
fjy cd9ba1f852 fix serde bug 2015-01-27 18:47:36 +08:00
Xavier Léauté b334d7973d fix background caching not preserving result order 2015-01-26 09:59:18 -08:00
Xavier Léauté 26c5c2193f fix BatchServerInventoryViewTest test timeout 2015-01-20 17:14:57 -08:00
fjy 1f94de22c6 [maven-release-plugin] prepare for next development iteration 2015-01-20 14:23:55 -08:00
fjy 17476edc31 [maven-release-plugin] prepare release druid-0.7.0-rc1 2015-01-20 14:23:51 -08:00
Xavier Léauté 5a2030c49b Merge pull request #1059 from druid-io/remove-test 
Remove test rejection policy - it has no place anywhere
 2015-01-20 13:39:46 -08:00
fjy 1ff5829d6d remove test rejection policy 2015-01-20 13:22:30 -08:00
Charles Allen 3d27747f7e Upgrade to log4j2 
Default behavior is as before.
Added documentation for how to enable synchronous logging for select chatty classes:
* io.druid.client.ServerInventoryView
* io.druid.client.BatchServerInventoryView
* io.druid.curator.inventory.CuratorInventoryManager
* com.metamx.http.client.pool.ChannelResourceFactory
 2015-01-20 12:35:18 -08:00
Fangjin Yang 91a79dbf95 Merge pull request #1031 from metamx/ingestmetadata-query 
DataSourceMetadata query
 2015-01-19 21:55:35 -08:00
Fangjin Yang 56bad2114a Merge pull request #1054 from metamx/increase-test-wait-time 
use waiting multiple when waiting in AnnouncerTest
 2015-01-19 11:03:35 -08:00
Xavier Léauté b5f0d119f1 use waiting multiple when waiting in AnnouncerTest 2015-01-19 10:19:13 -08:00
fjy 52f65b1273 Fix a small bug where an NPE can occur if a closeable is not present 2015-01-17 15:23:01 -08:00
fjy 38c155e143 Merge branch 'master' of https://github.com/druid-io/druid 2015-01-16 13:14:49 -08:00
Fangjin Yang b4041c13e5 Merge pull request #1029 from metamx/fixChainedExecutionQueryRunnerTest 
Address spurious test failures
 2015-01-16 13:08:32 -08:00
Xavier Léauté 6bc6e71b0d Add messages to catch spurious test failures 2015-01-15 16:49:43 -08:00
fjy f7ea308b25 fix minor error output problem 2015-01-15 15:57:45 -08:00
Fangjin Yang 5bfcc43377 Merge pull request #1008 from metamx/stringConversionJavaUtilUpdate 
Update all String conversions to and from byte[] to use the java-util StringUtils functions
 2015-01-15 13:50:27 -08:00
nishantmonu51 c7452b75f6 Merge branch 'master' into ingestmetadata-query 2015-01-15 18:00:31 +05:30
fjy 021a7de759 Add retry capabilities for realtime logic 2015-01-13 14:30:49 -08:00
fjy 84cc32ba32 Add more logging for when ingestion may be throttled 2015-01-08 14:51:46 -08:00
Charles Allen c1295202ff Allow background caching run after the futures are finished 2015-01-07 13:23:34 -08:00
Charles Allen f6fbb733b8 Added a few places where tests were using Object instead of Module 2015-01-05 13:47:25 -08:00
Fangjin Yang 852e863425 Merge pull request #981 from druid-io/strictModuleTyping 
Use Module instead of generic Object in Guice related items
 2015-01-05 12:43:20 -08:00
Fangjin Yang ab0ddc0d7c Merge pull request #998 from drcrallen/zkConfigJackson 
Change zk configs to use Jackson injection instead of Skife
 2015-01-05 12:42:40 -08:00
Charles Allen b1b5c9099e Update all String conversions to and from byte[] to use the java-util StringUtils functions 
* Speedup of GroupBy with javaScript filters by ~10%
* Requires https://github.com/metamx/java-util/pull/15
 2015-01-05 11:22:32 -08:00
Charles Allen 81fdc791e0 Add memory hinting and concurrency helpers in CachingClusteredClient 2015-01-02 15:54:26 -08:00
Charles Allen 65286a24e0 Change zk configs to use Jackson injection instead of Skife 
* Also added generic config testing class JsonConfigTesterBase
 2014-12-29 10:36:12 -08:00
Xavier Léauté 574ab3017c fix test timeout 2014-12-23 16:25:38 -08:00
Fangjin Yang bf4b52384c Merge pull request #988 from drcrallen/queryErrorFixer 
Fix NPE in QueryResource on bad query
 2014-12-22 23:16:59 -08:00
Charles Allen 458236c8fd Add simple unit tests for QueryResource 2014-12-22 21:53:58 -08:00
Charles Allen 4338af0e3f Fix NPE in QueryResource on bad query 2014-12-22 12:59:47 -08:00
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
Charles Allen 7c8d4a7433 Use Module instead of generic Object in Guice related items 2014-12-19 10:54:06 -08:00
Charles Allen a0b2a63d7f Fix deadlock in DirectDruidClient 2014-12-16 18:34:30 -08:00
fjy e9238161cd fix broken test 2014-12-15 18:12:44 -08:00
Charles Allen 242edd14e5 Add deprecated smile media type for backwards compatability during upgrades 2014-12-15 18:00:10 -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
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 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
Xavier Léauté 77bf5da317 fix typo 2014-12-15 10:07:51 -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 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
Xavier Léauté 352480ac77 make method protected to prevent accidental usage 
- add documentation as to why
 2014-12-11 15:20:36 -08:00
Xavier Léauté 3abf348d2c fix router discovering brokers with default names 2014-12-11 12:16:44 -08:00
nishantmonu51 7ad03087c0 Merge branch 'master' into ingestmetadata-query 2014-12-11 16:54:38 +05:30
nishantmonu51 32b4f55b8a review comments refactoring 2014-12-11 16:33:14 +05:30
Xavier Léauté eb661d3130 /status replaces /health 2014-12-10 17:35:05 -08:00
Xavier Léauté 0de56efe5c fix gzip compression 
- fixes compression not working for POST requests
- router now forwards raw bytes instead of decompressing
- cleanded up router servlet initialization
- add test for gzip on get and post methods
- use Jersey annotation when possible in QueryResource
 2014-12-10 17:30:17 -08:00
Xavier Léauté 7878d391bd use first available port for JettyTest 2014-12-10 12:53:11 -08:00
Charles Allen 6f6cc463b0 Merge pull request #950 from metamx/fix-bysegment-serde 
Fix bySegment metrics de-serialization
 2014-12-10 12:42:40 -08:00
Xavier Léauté 5f3f4e0a60 prevent /status from redirect, fixes #953 2014-12-10 11:32:22 -08:00
Xavier Léauté 7853e801d5 fixes for bySegment queries and caching 
- prevent bySegment queries from getting cached
- avoid computing cache keys if not populating or using cache
- avoid computing cache data when not populating cache
 2014-12-10 10:57:48 -08:00
nishantmonu51 3763357f6e Ingest metadata query implementation 2014-12-10 19:44:00 +05:30
Xavier Léauté c44242f0af add comment about de-serialing bySegment 2014-12-09 17:02:24 -08:00
Xavier Léauté a7da9aed9f fix metrics de-serialization for bySegment results 2014-12-09 17:02:23 -08:00
fjy 7620dfbd1a fix broken ut 2014-12-09 15:43:07 -08:00
Fangjin Yang d6d3ec6846 Merge pull request #948 from metamx/ingestion-docs 
Redocumenting ingestion
 2014-12-09 15:30:03 -07:00
nishantmonu51 1a1b0e6f23 merge from master and review comments 2014-12-09 13:16:45 +05:30
fjy 28b72a69ad redocumenting ingestion 2014-12-08 16:15:46 -08:00
Fangjin Yang 623443a145 Merge pull request #946 from metamx/MoreMediaTypes 
Changed all "application/json" to MediaType.APPLICATION_JSON  except for in druid.js
 2014-12-08 15:24:21 -07:00
Charles Allen a0f9f9877e Changed all "application/json" to MediaType.APPLICATION_JSON except for in druid.js 2014-12-08 14:21:49 -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 c48839a0a0 Merge pull request #945 from metamx/MediaTypeFixes 
Added checks for backwards compat on MediaTypes
 2014-12-08 14:11:58 -07:00
Charles Allen 43041ed4ba Added checks for backwards compat on MediaTypes 2014-12-08 13:11:00 -08:00
Fangjin Yang eb233fe50e Merge pull request #921 from metamx/onheap-incremental-index 
separate implementations of  incremental index
 2014-12-08 13:59:08 -07:00
Charles Allen 03f7fae3e8 Changed references to MediaType to pull from javax.ws.rs.core.MediaType or com.fasterxml.jackson.jaxrs.smile.MediaType 2014-12-08 12:39:36 -08:00
Xavier Léauté c88de97370 Merge branch 'master' into onheap-incremental-index 
Conflicts:
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
 2014-12-08 11:48:21 -08:00