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

2155 Commits

Author SHA1 Message Date
Xavier Léauté 6e8ac89737 refactor sequence merging method to simplify testing 2014-11-14 11:17:50 -08:00
Xavier Léauté 716cc2cff2 fix results ordering 2014-11-13 14:59:56 -08:00
fjy 313d81ca2f fix non-determininistic reference counting segment test 2014-11-13 13:39:56 -08:00
Gian Merlino bf22524d63 RealtimePlumber: Bail out of persist-n-merge of abandoned sinks (fixes #812). 2014-11-13 12:59:49 -08:00
fjy 0d6816a037 Fix a couple of bugs with retry query runner after testing it locally 2014-11-13 11:53:29 -08:00
Fangjin Yang 9d661d6d36 Merge pull request #854 from metamx/serverInventoryViewJson 
Better logging in JSON parse errors in ServerInventoryView
 2014-11-13 11:56:59 -07:00
Charles Allen 9a9238a801 Merge remote-tracking branch 'origin/master' into druid-845 2014-11-13 10:04:56 -08:00
Charles Allen 3cdcf8736f Changed downloadStartMarker in OmniSegmentLoader to simply use its .delete() method 2014-11-13 09:52:41 -08:00
Xavier Léauté ba442b9882 fix default FilteredServerView + batch annoucement 2014-11-12 23:17:16 -08:00
fjy 3ef21bfc66 fix leak with files not cleaning up correctly 2014-11-12 22:29:50 -08:00
Charles Allen 31fed7d329 Fix query by segment 
* Changed topN queries to use joda Interval instead of string values
* topN by segment now implements BySegmentResultValue<Result<TopNResultValue>> instead of BySegmentResultValue<TopNResultValue>
* Added a unit test which failed uner the prior implementation.
 2014-11-12 21:20:59 -08:00
Charles Allen a8103fb02d Better logging in JSON parse errors in ServerInventoryView 2014-11-12 16:52:15 -08:00
xvrl 10b7ca9fa9 Merge pull request #849 from metamx/default-coordinator-service-name 
Default service names
 2014-11-12 15:06:02 -08:00
Xavier Léauté 3a9def7fb1 add broker default and define constants 2014-11-12 14:53:53 -08:00
Xavier Léauté 4ac1aaf90e Merge remote-tracking branch 'origin/master' into druid-0.7.x 
Conflicts:
	processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java
 2014-11-12 14:08:51 -08:00
Xavier Léauté dbab127a6d default zk host to localhost 2014-11-12 13:56:07 -08:00
Fangjin Yang 58260165ad Merge pull request #842 from metamx/fix-timestamp-column-exclusion 
fix dimension exclusions for timestamp and aggs
 2014-11-12 09:44:50 -07:00
Charles Allen 847c01a045 Merge pull request #844 from metamx/derby-dependencies-fix 
specify versions in parent pom
 2014-11-12 08:28:55 -08:00
nishantmonu51 c9bcdd5dd0 specify versions in parent pom 
- move version declarations to parent pom
- remove extra dependency
 2014-11-12 10:31:11 +05:30
Xavier Léauté 69146736a8 fix dimension exclusions for timestamp and aggs 
- also added tests
 2014-11-11 20:56:17 -08:00
Xavier Léauté 87b72e8822 fix non-deterministic test 2014-11-11 20:26:13 -08:00
Charles Allen a89b539b4f Merge pull request #823 from metamx/roaring 
Configurable bitmap indexes: roaring and concise
 2014-11-11 17:26:38 -08:00
Xavier Léauté 59f093882d fix Derby instantiation 2014-11-10 16:55:53 -08:00
fjy 8cbd21af90 fix defaults 2014-11-10 15:40:57 -08:00
fjy 98d05e63bf make derby instance only on coordinator 2014-11-10 15:34:49 -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
nishantmonu51 42a61290a8 specify default service name for coordinator 2014-11-10 23:36:01 +05:30
fjy 3c21f62afd a whole bunch of fixes and some ugly conversion code 2014-11-07 16:03:22 -08:00
Xavier Léauté 0498df25df override metadata storage injection in CliHadoopIndexer 2014-11-07 13:44:56 -08:00
Fangjin Yang 2336e6c167 Merge pull request #758 from metamx/jisoo-metadata 
make metadata storage pluggable
 2014-11-07 11:30:11 -07:00
nishantmonu51 5be801356a fix query/wait emitted twice 2014-11-07 23:32:36 +05:30
nishantmonu51 fd8eb7742b handle union query on realtime node 2014-11-07 23:27:50 +05:30
nishantmonu51 8bebb24fd5 Union Queries move merge to historical 2014-11-07 18:05:16 +05:30
Xavier Léauté d8bab70647 provide proper defaults for indexing service name 2014-11-06 18:16:01 -08:00
Xavier Léauté a5f98be457 remove unused code 2014-11-06 17:18:40 -08:00
Xavier Léauté f69f3cfc5a run MetadataSegmentManagerTest against Derby 2014-11-06 17:08:54 -08:00
Xavier Léauté ac753ed0f0 always use validation query 2014-11-06 17:08:01 -08:00
Xavier Léauté 350bb09605 refactor sql storage to abstract task storage 2014-11-05 17:19:37 -08:00
Xavier Léauté 253c0a70b3 simplify interface + more tests 2014-11-04 15:03:13 -08:00
Xavier Léauté b453922319 add tests for task and task status storage 2014-11-04 14:35:39 -08:00
Xavier Léauté adb4fec264 properly serialize task timestamps, fixes #819 2014-11-04 11:06:34 -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 c6d555e1f3 better default 2014-11-04 10:18:27 -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
Xavier Léauté 3468163dcd remove unused imports 2014-10-31 16:25:52 -07:00
Xavier Léauté cad4d22f35 better derby test database 2014-10-31 16:25:36 -07:00
Xavier Léauté 80c72eb486 minor test adjustments 2014-10-31 15:44:09 -07:00
Xavier Léauté 1872b8f979 make it easier to test 2014-10-31 14:49:07 -07:00
Xavier Léauté 0bd9ac1154 default to Derby + remove DBI injection 
- default to Derby, but still fail if the given
  metadata storage type does not exit
- use SQLMetadataConnector injection instead of DBI injection
  to simplify code
 2014-10-31 14:37:37 -07:00
jisookim0513 6d501008b8 moved MetadataConnector test to metadata package 2014-10-31 13:13:19 -07:00
jisookim0513 a6016d70fc added deleted classes back 2014-10-31 13:10:09 -07:00
jisookim0513 01f2b3482c merging 2014-10-31 12:52:53 -07:00
jisookim0513 df7566701d fixed syntax error in creating index statements; added a test for MetadataConnector 2014-10-31 12:52:15 -07:00
Xavier Léauté cbe6ea67ee more druid.db -> druid.metadata.storage and allow multiple storage extensions loaded at once 2014-10-31 12:03:04 -07:00
Xavier Léauté 97a2f5af4a rename db->metadata 2014-10-31 10:54:33 -07:00
Xavier Léauté 9c06db021f rename db->metadata postgres->postgresql 2014-10-31 10:30:27 -07:00
Xavier Léauté f77b810f36 fix imports 2014-10-31 10:01:58 -07:00
Xavier Léauté 9fea34be4b simplify connectors even further 2014-10-31 09:59:34 -07:00
Xavier Léauté df0af894f4 fix factory binding + remove unused imports 2014-10-30 22:35:37 -07:00
Xavier Léauté fb4d41cedb make the injection gods happy 2014-10-30 21:16:36 -07:00
Xavier Léauté 377151beda better abstraction for metadatastorage 2014-10-30 18:23:35 -07:00
Xavier Léauté 3cc1b2e690 remove mysql dependencies + fix jdbc class loading 2014-10-29 17:30:43 -07:00
Xavier Léauté c2727dd063 better type 2014-10-29 14:22:00 -07:00
Xavier Léauté 1f171a2b86 workaround for Derby requiring batch statements 
+ make sure payloads are always written as bytes
 2014-10-29 13:59:37 -07:00
Xavier Léauté 55d5f1f618 remove commented out code 2014-10-29 12:55:03 -07:00
Xavier Léauté 7be252599e reduce memory usage when pulling segments 2014-10-29 12:43:21 -07:00
Xavier Léauté 68b9436199 optimize imports 2014-10-29 12:07:21 -07:00
Xavier Léauté e8b4640875 remove duplicate code in table creation 2014-10-29 11:47:29 -07:00
Xavier Léauté 123296b767 add documentation 2014-10-29 11:31:25 -07:00
Xavier Léauté 54eb434a0b remove Derby specific code in favor of better generic JDBI code 2014-10-29 01:09:05 -07:00
Xavier Léauté ec70ecc5fd make tests pass with Java 7 as well 2014-10-28 23:17:30 -07:00
Xavier Léauté 92afd10947 simplify SQL metadata storage 2014-10-28 18:12:30 -07:00
Xavier Léauté 575919ec6c provide a little more involved example 2014-10-27 19:18:09 -07:00
jisookim0513 aa754b86e8 build success! 2014-10-24 11:28:42 -07:00
fjy bef74104d9 merge with 0.7.x and resolve any conflicts 2014-10-23 17:24:06 -07:00
fjy 3b29e77866 [maven-release-plugin] prepare for next development iteration 2014-10-22 16:25:32 -07:00
fjy dcab2997f2 [maven-release-plugin] prepare release druid-0.6.160 2014-10-22 16:25:27 -07:00
jisookim0513 02e79d6b15 attempted to solve merge-conflict; IncrementalIndex has unresolved classes after updates - needs to be fixed 2014-10-22 00:18:17 -07:00
jisookim0513 197878ae75 changed SQLMetadataConnector to a concrete class 2014-10-21 23:39:58 -07:00
jisookim0513 a0d9944fa6 changed SQLMetadataConnector to a concrete class 2014-10-21 23:38:26 -07:00
Fangjin Yang 3d8f33d4ad Merge pull request #801 from metamx/fix-unordered-merging 
fix ordering for partitions with same start time, fixes #796
 2014-10-21 16:47:31 -06:00
Xavier Léauté 8735272ce3 fix file casing 2014-10-21 15:36:49 -07:00
Xavier Léauté fd7d3e5ace make it work with Java 8 2014-10-21 15:33:28 -07:00
Xavier Léauté 9d5e65913d fix serde 2014-10-21 15:05:08 -07:00
jisookim0513 37979282fe enabled ansi-quote in mysql; insert statement should now work 2014-10-21 00:09:19 -07:00
Xavier Léauté 23a59db566 fix ordering for partitions with same start time, fixes #796 
Partitions with same start time may produce results out of order,
           especially in the presence of data gaps.

Results for those segments must be re-ordered prior to being merged
 2014-10-20 17:22:23 -07:00
Xavier Léauté 38cb73e0cc javacript tiered broker selector strategy 2014-10-20 14:12:30 -07:00
jisookim0513 7d5c5f2083 fixed createTable; fixed miscellaneous stuff; added DerbyMetadataRuleManagerProvider 2014-10-17 00:10:36 -07:00
nishantmonu51 f4a97aebbc fix rollup for hashed partitions 
truncate timestamp while calculating the partitionNumber
 2014-10-15 22:32:56 +05:30
nishantmonu51 bce388fb27 merge changes from 0.7.x branch 2014-10-14 18:46:02 +05:30
nishantmonu51 b5d66381f3 more cleanup 2014-10-14 18:32:40 +05:30
jisookim0513 76304d6b7b made modifications according to comments; need to fix some more 2014-10-13 23:56:09 -07:00
fjy a4c8f04409 [maven-release-plugin] prepare for next development iteration 2014-10-13 12:50:45 -07:00
fjy 7fd1747ffa [maven-release-plugin] prepare release druid-0.6.159 2014-10-13 12:50:41 -07:00
nishantmonu51 035b4c1af4 more cleanup 2014-10-14 00:57:15 +05:30
nishantmonu51 454acd3f5a remove backwards compatible code 
1) remove backwards compatible and deprecated code
2) make hashed partitions spec default
 2014-10-13 19:30:44 +05:30
jisookim0513 0dda8975e7 deleted DerbyMetadataRule/SegmentManagerProvider and replaced them with SQL ones 2014-10-10 16:54:33 -07:00
jisookim0513 66277ddf2b deleted dbSegmentPublisher 2014-10-10 12:41:35 -07:00
fjy d0fbd5f729 [maven-release-plugin] prepare for next development iteration 2014-10-09 14:24:53 -07:00
fjy dada60a301 [maven-release-plugin] prepare release druid-0.6.158 2014-10-09 14:24:48 -07:00
Xavier Léauté 290107ce7b remove unused jsonspec content type 2014-10-09 10:26:47 -07:00
fjy 8a4b32c482 [maven-release-plugin] prepare for next development iteration 2014-10-07 14:30:26 -07:00
fjy 96e29c2fdd [maven-release-plugin] prepare release druid-0.6.157 2014-10-07 14:30:20 -07:00
Xavier Léauté 8f7f497b55 jax-rs smile support 2014-10-07 14:19:59 -07:00
Xavier Léauté 30183d3b4d update druid-api for json parsing improvements 2014-10-07 13:25:02 -07:00
fjy d4217f1588 Merge pull request #777 from metamx/initialized-endpoint 
Historical endpoints accessible while loading + new loadstatus endpoint
 2014-10-06 17:35:58 -06:00
Xavier Léauté 81641d7887 http accessible while loading + status endpoint 2014-10-06 13:32:27 -07:00
fjy c7b4d5b7b4 Merge branch 'master' into druid-0.7.x 
Conflicts:
	processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java
 2014-10-02 18:12:10 -07:00
Gian Merlino efa898422d Merge pull request #773 from metamx/cleanup-metrics 
Use multi-val dims for metrics
 2014-10-02 17:58:50 -07:00
fjy 816986f914 cleanup according to cr 2014-10-02 17:51:33 -07:00
fjy 75fb7986df Merge pull request #602 from metamx/offheap-incremental-index 
Offheap incremental index
 2014-10-01 16:20:24 -06:00
fjy 4fc0382d8a add more logging 2014-10-01 09:13:59 -07:00
nishantmonu51 ad75a21040 separate offheapIncrementalIndex implementation 2014-10-01 13:58:51 +05:30
fjy c3bea245a7 fix up some bugs 2014-09-30 17:20:52 -07:00
fjy 5b166134fb add docs 2014-09-30 14:59:02 -07:00
fjy 6d2747adcf make loading local files easier 2014-09-30 14:50:48 -07:00
fjy ee713f8e94 Merge pull request #727 from metamx/new-console-0.7.x 
New console 0.7.x
 2014-09-30 15:36:32 -06:00
jisookim0513 0e50852985 fixed MetadataTaskStorage and handler 2014-09-30 14:09:23 -07:00
jisookim0513 9d7b5d9b0f fixed javadoc; fixed pom files; deleted unnecessary class 2014-09-30 13:47:35 -07:00
fjy 0f96a09939 use multi-val dims for metrics 2014-09-30 13:36:01 -07:00
nishantmonu51 91eecfe3e7 fix #730 - memory check throws exception if fails 
fix exception handling, do not catch ProvisionException
 2014-09-30 23:03:40 +05:30
nishantmonu51 358ff915bb fix merge conflicts 2014-09-30 22:19:18 +05:30
nishantmonu51 2789536bed merge changes from druid-0.7.x 2014-09-30 22:05:49 +05:30
nishantmonu51 61c7fd2e6e make ingestOffheap tuneable 2014-09-30 15:30:02 +05:30
nishantmonu51 8cecb00aa9 upgrade jetty and workaround for half open connection 
Upgrade jetty and set acceptor priority delta to -1
 to give priority to servicing connections already accepted rather than
opening new connections.
 2014-09-30 14:22:16 +05:30
fjy 1a67ebe861 fix regression in test 2014-09-29 15:22:26 -07:00
nishantmonu51 adb4a65e0a Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-29 12:38:31 +05:30
jisookim0513 74565c9371 cleaned up the code 2014-09-27 13:10:01 -07:00
jisookim0513 aa887edb73 added two seperate modules for mysql and postgres 2014-09-27 13:08:53 -07:00
fjy fb1d6c177a fix dynamic config bug 2014-09-26 15:45:20 -07:00
jisookim0513 91bf8fadcf added MetadataSegmentManagerTest 2014-09-26 15:38:40 -07:00
jisookim0513 59b3e79c70 derby seems to be working..? 2014-09-26 14:36:17 -07:00
jisookim0513 6a641621b2 finished merging into druid-0.7.x; derby not working (to be fixed) 2014-09-26 14:24:53 -07:00
jisookim0513 43cc6283d3 trying to revert files that have overwritten changes 2014-09-26 12:38:04 -07:00
fjy 4244accab5 Merge branch 'druid-0.7.x' of github.com:metamx/druid into druid-0.7.x 2014-09-26 11:39:50 -07:00
fjy eaf0a48b92 Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
 2014-09-26 11:39:24 -07:00
jisookim0513 a5d02b9030 second attempt to fix merge-conflicts 2014-09-24 15:59:00 -07:00
jisookim0513 3bf39cc9f8 attempted to fix merge-conflicts 2014-09-24 15:55:42 -07:00
Xavier Léauté 77c9afe92f try to make javadoc happy 2014-09-23 18:53:29 -07:00
Xavier Léauté 7cfe86b7bc [maven-release-plugin] prepare for next development iteration 2014-09-23 16:31:25 -07:00
Xavier Léauté 80166314d9 [maven-release-plugin] prepare release druid-0.6.156 2014-09-23 16:31:21 -07:00
Xavier Léauté d02fd97ea3 fix comment 2014-09-23 16:25:46 -07:00
Xavier Léauté 8603d2fd3e keep default behavior 2014-09-23 16:23:02 -07:00
fjy 4235e14fc6 [maven-release-plugin] prepare for next development iteration 2014-09-23 16:12:43 -07:00
fjy 576e9b8a84 [maven-release-plugin] prepare release druid-0.6.155 2014-09-23 16:12:39 -07:00
Xavier Léauté 35fb210cfa add test for parallel loading 2014-09-23 16:06:46 -07:00
Xavier Léauté 05d4f71ddc fix background annoucing race condition 2014-09-23 15:04:48 -07:00
Xavier Léauté 12449481e3 parallelize segment loading 2014-09-22 16:33:25 -07:00
nishantmonu51 f51ab84386 merge changes from druid-0.7.x 2014-09-22 23:48:45 +05:30
nishantmonu51 443e5788fb make OffheapIncrementalIndex tuneable 2014-09-22 19:26:10 +05:30
jisookim0513 273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -07:00
nishantmonu51 8eb6466487 revert buffer size and add back rowFlushBoundary 2014-09-19 23:06:04 +05:30
Xavier Léauté 32b6135f3d background announce segment cache 2014-09-18 12:09:20 -07:00
fjy a17794a516 [maven-release-plugin] prepare for next development iteration 2014-09-16 15:22:55 -07:00
fjy f9c91ace3f [maven-release-plugin] prepare release druid-0.6.154 2014-09-16 15:22:49 -07:00
Xavier Léauté d9a0d403b3 default zk compressed + batch announcements in 0.7 2014-09-16 14:54:45 -07:00
fjy 8b387034a3 Merge pull request #741 from metamx/serverview-initialization 
initialize segment view before announcing broker
 2014-09-16 15:35:09 -06:00
fjy 1dbb6fd4b0 Merge pull request #736 from metamx/fix-synchronized 
fix synchronized on field getting updated
 2014-09-16 11:06:35 -06:00
Xavier Léauté 762485a0c9 remove unnecessary transient 2014-09-16 09:59:25 -07:00
Xavier Léauté f1e3518f37 initialize segment view before announcing broker 2014-09-16 00:07:31 -07:00
xvrl a73670ee7b Merge pull request #738 from metamx/dim-ex 
Have better dimension exclusions
 2014-09-15 17:14:29 -07:00
fjy 77dbac3739 fix import 2014-09-15 17:10:34 -07:00
fjy f2d6360d4d cleanup 2014-09-15 17:08:45 -07:00
fjy 34ae426ffa address cr 2014-09-15 17:08:02 -07:00
fjy 1ab2662772 have better dimension exclusions 2014-09-15 16:52:07 -07:00
Xavier Léauté 02892233ac fix synchronized on field getting updated 2014-09-15 13:56:31 -07:00
fjy aa28bc0613 address cr 2014-09-15 13:14:23 -07:00
Xavier Léauté 0712c666cb null check for something that cannot be null 2014-09-15 13:00:06 -07:00
Xavier Léauté c8b8e3f6e9 negating compare is bad 2014-09-15 13:00:06 -07:00
Xavier Léauté 137ad50bf1 classes that should be static 2014-09-15 13:00:06 -07:00
Xavier Léauté e57e2d97ba make constants final 2014-09-15 12:53:40 -07:00
Xavier Léauté d4795ce927 fix missing charsets 2014-09-15 12:53:40 -07:00
Xavier Léauté cfa92e8217 fix incorrect nullable annotations 2014-09-15 12:13:52 -07:00
fjy cbf5076961 still propagate log 2014-09-12 11:43:42 -07:00
fjy e62ed40d86 make some logs not emit 2014-09-11 16:49:18 -07:00
fjy 469ccbbe5e Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java
	processing/src/main/java/io/druid/query/UnionQueryRunner.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java
	processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java
	processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/test/java/io/druid/server/initialization/JettyTest.java
	services/pom.xml
 2014-09-11 16:20:50 -07:00
Xavier Léauté 32e256a842 [maven-release-plugin] prepare for next development iteration 2014-09-10 17:24:15 -07:00
Xavier Léauté f7dc13d240 [maven-release-plugin] prepare release druid-0.6.153 2014-09-10 17:24:11 -07:00
fjy fec7b43fcb make making v9 segments something completely configurable 2014-09-10 15:28:30 -07:00
Xavier Léauté d6f6a59ae2 fix for missing context when embedding broker 2014-09-09 14:25:56 -07:00
Tarek Rached 609887887e updated env when we are local 2014-09-09 13:29:42 -07:00
Tarek Rached ae2a09ab5e added new console 2014-09-09 12:44:57 -07:00
Tarek Rached 47b52aaae1 moved old console to old-console 2014-09-09 12:44:30 -07:00
Xavier Léauté 22553b0b28 [maven-release-plugin] prepare for next development iteration 2014-09-05 11:07:22 -07:00
Xavier Léauté 570a7a07bf [maven-release-plugin] prepare release druid-0.6.152 2014-09-05 11:07:14 -07:00
fjy e24be03a38 [maven-release-plugin] prepare for next development iteration 2014-09-04 14:10:13 -07:00
fjy a933ea1866 [maven-release-plugin] prepare release druid-0.6.151 2014-09-04 14:10:09 -07:00
xvrl c4c54f7bc9 Merge pull request #721 from metamx/fix-union-query 
fix Union Query result merging
 2014-09-04 12:20:19 -07:00
nishantmonu51 0dec5826ed remove unused imports 2014-09-05 00:07:42 +05:30
nishantmonu51 90632ecf3a review comment - have separate methods 2014-09-05 00:03:36 +05:30
fjy f473e62f1f Merge pull request #714 from metamx/cleanup-javadocs 
Cleanup javadocs
 2014-09-04 12:28:10 -06:00
nishantmonu51 2772a78b3b review comments - move merging to tool chest 2014-09-04 11:31:04 +05:30
nishantmonu51 268a42bd79 fix Union Query result merging 2014-09-03 16:38:02 +05:30
Xavier Léauté 508e982190 Merge remote-tracking branch 'origin/master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java
	services/pom.xml
 2014-08-30 22:42:36 -07:00
Gian Merlino 96d7b18163 [maven-release-plugin] prepare for next development iteration 2014-08-29 15:29:58 -07:00
Gian Merlino 860cf36ab1 [maven-release-plugin] prepare release druid-0.6.150 2014-08-29 15:29:54 -07:00
Xavier Léauté 58ab759fc6 remove unused imports 2014-08-29 14:03:47 -07:00
Xavier Léauté ac05836833 make Java 8 javadoc happy 2014-08-29 13:58:50 -07:00
Xavier Léauté daca178631 [maven-release-plugin] prepare for next development iteration 2014-08-29 10:43:19 -07:00