Commit Graph

671 Commits

Author SHA1 Message Date
fjy 4482e1b7d8 [maven-release-plugin] prepare release druid-0.6.140 2014-08-08 15:16:34 -07:00
fjy ddcea18631 fix dependencies 2014-08-08 14:02:14 -07:00
fjy 74646f18f4 [maven-release-plugin] prepare for next development iteration 2014-08-08 11:40:52 -07:00
fjy 78c7140b52 [maven-release-plugin] prepare release druid-0.6.139 2014-08-08 11:40:46 -07:00
fjy 9f4dd7b33e [maven-release-plugin] prepare for next development iteration 2014-08-06 13:34:04 -07:00
fjy aa5cb91618 [maven-release-plugin] prepare release druid-0.6.138 2014-08-06 13:33:59 -07:00
fjy 65b8278add [maven-release-plugin] prepare for next development iteration 2014-08-01 10:14:34 -07:00
fjy 0ecbef6c5d [maven-release-plugin] prepare release druid-0.6.137 2014-08-01 10:14:30 -07:00
fjy bf8c24f88d [maven-release-plugin] prepare for next development iteration 2014-07-31 14:08:38 -07:00
fjy 66020fc2b6 [maven-release-plugin] prepare release druid-0.6.136 2014-07-31 14:08:34 -07:00
nishantmonu51 637bd35785 merge changes from druid-0.7.x 2014-07-31 16:07:22 +05:30
fjy a8c8e4cb51 [maven-release-plugin] prepare for next development iteration 2014-07-29 22:03:14 -07:00
fjy 25eda62a0c [maven-release-plugin] prepare release druid-0.6.135 2014-07-29 22:03:09 -07:00
fjy 0c898c58d1 [maven-release-plugin] prepare for next development iteration 2014-07-29 18:01:06 -07:00
fjy c8244d05d1 [maven-release-plugin] prepare release druid-0.6.134 2014-07-29 18:01:02 -07:00
fjy f7319620c4 [maven-release-plugin] prepare for next development iteration 2014-07-29 17:40:56 -07:00
fjy 540a146eaa [maven-release-plugin] prepare release druid-0.6.133 2014-07-29 17:40:52 -07:00
fjy b5ecf000ad [maven-release-plugin] prepare for next development iteration 2014-07-29 16:20:14 -07:00
fjy 877bd98667 [maven-release-plugin] prepare release druid-0.6.132 2014-07-29 16:20:10 -07:00
fjy e1d87ed5ea [maven-release-plugin] prepare for next development iteration 2014-07-29 14:13:41 -07:00
fjy c46965c52c [maven-release-plugin] prepare release druid-0.6.131 2014-07-29 14:13:37 -07:00
fjy 1de0f89718 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:55:50 -07:00
fjy 39bff5c1c2 [maven-release-plugin] prepare release druid-0.6.130 2014-07-18 11:55:46 -07:00
fjy 9e303527f2 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:17:56 -07:00
fjy ea04022772 [maven-release-plugin] prepare release druid-0.6.129 2014-07-18 11:17:52 -07:00
nishantmonu51 4ce12470a1 Add way to skip determine partitions for index task
Add a way to skip determinePartitions for IndexTask by manually
specifying numShards.
2014-07-18 18:52:15 +05:30
nishantmonu51 f5f05e3a9b Sync changes from branch new-ingestion PR #599
Sync and Resolve Conflicts
2014-07-11 16:15:10 +05:30
nishantmonu51 fa43049240 review comments & pom changes 2014-07-10 11:48:46 +05:30
nishantmonu51 36fc85736c Add ShardSpec Lookup
Optimize choosing shardSpec for Hash Partitions
2014-07-08 18:01:31 +05:30
Xavier Léauté 70ae6e1fcd Approximate Histogram Module 2014-07-01 15:10:23 -07:00
fjy 4c40e71e54 address cr 2014-06-19 14:48:46 -07:00
fjy a870fe5cbe inject column config 2014-06-19 14:47:57 -07:00
Xavier Léauté 09346b0a3c make column cache configurable 2014-06-19 14:43:03 -07:00
fjy 0bc1915067 Merge pull request #578 from metamx/new-guava
Update guava, java-util, and druid-api
2014-06-18 14:23:32 -06:00
Gian Merlino 7c7d170e78 [maven-release-plugin] prepare for next development iteration 2014-06-18 10:53:40 -07:00
Gian Merlino a52a1d3929 [maven-release-plugin] prepare release druid-0.6.128 2014-06-18 10:53:36 -07:00
Gian Merlino 9532beb05c [maven-release-plugin] prepare for next development iteration 2014-06-17 17:29:31 -07:00
Gian Merlino e3dcbde07d [maven-release-plugin] prepare release druid-0.6.127 2014-06-17 17:29:27 -07:00
Gian Merlino a658afe902 [maven-release-plugin] prepare for next development iteration 2014-06-17 13:01:01 -07:00
Gian Merlino 4e875b8084 [maven-release-plugin] prepare release druid-0.6.126 2014-06-17 13:00:54 -07:00
Gian Merlino 964f12b7d6 [maven-release-plugin] prepare for next development iteration 2014-06-16 16:56:44 -07:00
Gian Merlino 4e184e3793 [maven-release-plugin] prepare release druid-0.6.125 2014-06-16 16:56:37 -07:00
Gian Merlino ef7e786b96 [maven-release-plugin] prepare for next development iteration 2014-06-16 16:38:08 -07:00
Gian Merlino 96be9faec7 [maven-release-plugin] prepare release druid-0.6.124 2014-06-16 16:37:59 -07:00
nishantmonu51 2d03888a2c Merge branch 'master' into offheap-incremental-index
Conflicts:
	processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChe
st.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.j
ava
2014-06-16 20:43:17 +05:30
Xavier Léauté a5c533dcab [maven-release-plugin] prepare for next development iteration 2014-06-13 15:17:00 -07:00
Xavier Léauté 903f1a695f [maven-release-plugin] prepare release druid-0.6.123 2014-06-13 15:16:36 -07:00
fjy 0fd57dbc75 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:05:18 -07:00
fjy bcc6e77919 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:05:14 -07:00
Xavier Léauté b7b28ad2f9 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 15:03:03 -07:00
Xavier Léauté 695a2946a9 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:01:13 -07:00
Xavier Léauté 83b2434cad [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:01:09 -07:00
Xavier Léauté bd18fef474 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:57:31 -07:00
Xavier Léauté 1159e2e415 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:56:12 -07:00
Xavier Léauté 6505f82053 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:54:23 -07:00
Xavier Léauté f6d319dac2 [maven-release-plugin] prepare for next development iteration 2014-06-13 14:46:08 -07:00
Xavier Léauté 394d0cfbca [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:45:43 -07:00
fjy a63cda3281 Merge branch 'master' into new-guava
Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java
2014-06-13 10:08:10 -07:00
nishantmonu51 025814cfff Merge branch 'master' into offheap-incremental-index
Conflicts:
	processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactor
y.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndexSt
orageAdapter.java
2014-06-12 20:02:27 +05:30
nishantmonu51 a7e19ad892 configure buffer sizes 2014-06-12 19:32:37 +05:30
fjy 46ef5c4560 [maven-release-plugin] prepare for next development iteration 2014-06-05 10:03:31 -07:00
fjy 0265ae9ac0 [maven-release-plugin] prepare release druid-0.6.121 2014-06-05 10:03:26 -07:00
nishantmonu51 6265613bb9 Merge branch 'master' into offheap-incremental-index 2014-06-05 17:42:57 +05:30
nishantmonu51 01e8a713b6 unit tests passing with offheap-indexing 2014-06-05 17:42:53 +05:30
fjy e8aef86458 [maven-release-plugin] prepare for next development iteration 2014-06-04 20:22:31 -07:00
fjy 033f81ca64 [maven-release-plugin] prepare release druid-0.6.120 2014-06-04 20:22:14 -07:00
Gian Merlino 3325f6d6ed [maven-release-plugin] prepare for next development iteration 2014-06-04 17:56:20 -07:00
Gian Merlino 6309ab1973 [maven-release-plugin] prepare release druid-0.6.119 2014-06-04 17:56:15 -07:00
Gian Merlino 1ca7bf03b8 IndexGeneratorJob needs to respect isCombineText, too. 2014-06-04 17:54:31 -07:00
fjy 4524863db1 [maven-release-plugin] prepare for next development iteration 2014-06-04 16:49:49 -07:00
fjy 37c6ece150 [maven-release-plugin] prepare release druid-0.6.118 2014-06-04 16:49:44 -07:00
fjy adc00f2bcf make combine text configurable 2014-06-04 16:24:56 -07:00
fjy 2d95780d12 [maven-release-plugin] prepare for next development iteration 2014-06-04 09:45:11 -07:00
fjy 30ce0ab99c [maven-release-plugin] prepare release druid-0.6.117 2014-06-04 09:45:06 -07:00
fjy bb4105ed1a fix broken standalone hadoop ingestion 2014-06-04 09:23:46 -07:00
fjy 77ec4df797 update guava, java-util, and druid-api 2014-06-03 13:43:38 -07:00
fjy 1407b49da1 [maven-release-plugin] prepare for next development iteration 2014-06-02 10:53:47 -07:00
fjy f91ecf20f3 [maven-release-plugin] prepare release druid-0.6.116 2014-06-02 10:53:43 -07:00
fjy 4c13327297 more logging for determine hashed 2014-05-30 16:19:20 -07:00
fjy ee60183df7 [maven-release-plugin] prepare for next development iteration 2014-05-29 17:26:55 -07:00
fjy d13a354ffb [maven-release-plugin] prepare release druid-0.6.115 2014-05-29 17:26:49 -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
Deepak 7d92cf2b3b Update IndexGeneratorJob.java
CombineTextInputFormat instead of TextInputFormat combines multiple splits for a single mapper and reduces the strain on hadoop platform. It greatly improves job completion time as there are fewer number of mappers to bookkeep.
2014-05-22 15:08:12 +05:30
Deepak de0a7b27e7 Update DetermineHashedPartitionsJob.java
CombineTextInputFormat instead of TextInputFormat combines multiple splits for a single mapper and reduces the strain on hadoop platform. It greatly improves job completion time as there are fewer number of mappers to bookkeep.
2014-05-22 15:06:56 +05:30
fjy 5ce80068d2 [maven-release-plugin] prepare for next development iteration 2014-05-20 13:22:52 -07:00
fjy 904c9049a7 [maven-release-plugin] prepare release druid-0.6.114 2014-05-20 13:22:48 -07:00
fjy 783f8fcc99 [maven-release-plugin] prepare for next development iteration 2014-05-20 12:47:33 -07:00
fjy def12c03bd [maven-release-plugin] prepare release druid-0.6.113 2014-05-20 12:47:29 -07:00
fjy e5454b47f1 [maven-release-plugin] prepare for next development iteration 2014-05-20 10:49:00 -07:00
fjy bcffb92181 [maven-release-plugin] prepare release druid-0.6.112 2014-05-20 10:48:53 -07:00
fjy dd59b58208 [maven-release-plugin] prepare for next development iteration 2014-05-19 21:17:09 -07:00
fjy 511aca9ea8 [maven-release-plugin] prepare release druid-0.6.111 2014-05-19 21:17:04 -07:00
Xavier Léauté 9ec7c71e0f fix compilation error with updated druid-api 2014-05-19 14:06:23 -07:00
Xavier Léauté 20c4fbc98d [maven-release-plugin] prepare for next development iteration 2014-05-16 16:34:19 -07:00
Xavier Léauté 4abcf3e16a [maven-release-plugin] prepare release druid-0.6.110 2014-05-16 16:34:12 -07:00
fjy da285d8665 [maven-release-plugin] prepare for next development iteration 2014-05-15 16:44:36 -07:00
fjy b7009c9102 [maven-release-plugin] prepare release druid-0.6.109 2014-05-15 16:44:32 -07:00
fjy 48ae84ed56 [maven-release-plugin] prepare for next development iteration 2014-05-07 12:40:14 -07:00
fjy 27f7c45e91 [maven-release-plugin] prepare release druid-0.6.108 2014-05-07 12:40:10 -07:00
fjy 42994cebcd [maven-release-plugin] prepare for next development iteration 2014-05-07 11:25:50 -07:00
fjy 2bf5c3831d [maven-release-plugin] prepare release druid-0.6.107 2014-05-07 11:25:45 -07:00
fjy 1100d2f2a1 rename configs to make a bit more sense 2014-05-06 14:52:50 -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
Gian Merlino 6f3f5c6e99 [maven-release-plugin] prepare for next development iteration 2014-05-06 11:28:39 -07:00
Gian Merlino a5a875e1ed [maven-release-plugin] prepare release druid-0.6.106 2014-05-06 11:28:34 -07:00
Gian Merlino bdf9e74a3b Allow config-based overriding of hadoop job properties. 2014-05-06 09:11:31 -07:00
fjy e0bce3168c [maven-release-plugin] prepare for next development iteration 2014-05-01 15:09:01 -07:00
fjy dd0004b759 [maven-release-plugin] prepare release druid-0.6.105 2014-05-01 15:08:57 -07:00
fjy f9523274ac remove extra println 2014-05-01 15:06:51 -07:00
nishantmonu51 5137031304 use same logic for compression
Use same logic for compression across creating files, reading from
files, and checking file existence
2014-05-01 15:20:47 +05:30
nishantmonu51 728f1e8ee3 fix exists check with compression 2014-05-01 15:01:10 +05:30
nishantmonu51 01e84f10b7 add the checks again.
removing these checks breaks when there is no data for any interval
2014-05-01 14:35:09 +05:30
fjy 015000ee8f [maven-release-plugin] prepare for next development iteration 2014-04-30 13:16:24 -07:00
fjy eae7d55dce [maven-release-plugin] prepare release druid-0.6.104 2014-04-30 13:16:20 -07:00
fjy 7700001e27 [maven-release-plugin] prepare for next development iteration 2014-04-30 10:45:20 -07:00
fjy 1e639792bf [maven-release-plugin] prepare release druid-0.6.103 2014-04-30 10:45:14 -07:00
fjy 9ad0da0794 [maven-release-plugin] prepare for next development iteration 2014-04-30 10:26:38 -07:00
fjy 5b7b29b61b [maven-release-plugin] prepare release druid-0.6.102 2014-04-30 10:26:34 -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é f88cb13ccb [maven-release-plugin] prepare for next development iteration 2014-04-24 17:27:58 -07:00
Xavier Léauté b8c14ba061 [maven-release-plugin] prepare release druid-0.6.101 2014-04-24 17:27:46 -07:00
fjy 5e98275251 [maven-release-plugin] prepare for next development iteration 2014-04-24 11:47:52 -07:00
fjy 35dc96e946 [maven-release-plugin] prepare release druid-0.6.100 2014-04-24 11:47:47 -07:00
fjy bec171fea9 [maven-release-plugin] prepare for next development iteration 2014-04-22 17:10:33 -07:00
fjy 67972ca5c5 [maven-release-plugin] prepare release druid-0.6.99 2014-04-22 17:10:27 -07:00
fjy 2d1f33e59f Merge pull request #500 from metamx/batch-ingestion-fixes
Batch ingestion fixes
2014-04-22 17:59:24 -06:00
nishantmonu51 357bbf5127 add all the shard specs 2014-04-23 05:23:11 +05:30
nishantmonu51 625a5418d2 minor fix 2014-04-23 05:05:51 +05:30
nishantmonu51 1ca61237c1 review comments- use final variables 2014-04-23 03:33:28 +05:30
nishantmonu51 0d8c1ffe54 review comments and add partitioner 2014-04-23 03:30:30 +05:30
nishantmonu51 ea4a80e8d2 Add serde test for shardCount 2014-04-23 00:24:08 +05:30
nishantmonu51 e920cec5d0 remove unused import 2014-04-23 00:13:30 +05:30
nishantmonu51 0748eabe9b batch ingestion fixes
1) Fix path when mapped output is compressed
2) Add number of reducers to the determine hashed partitions job
manually
3) Add a way to disable determine partitions and specify shardCount in
HashedPartitionsSpec
2014-04-23 00:05:08 +05:30
fjy 2df2cbf2a2 Merge pull request #466 from Crystark/patch-1
Support for postgresql
2014-04-22 12:18:05 -06:00
fjy bed8860fd4 [maven-release-plugin] prepare for next development iteration 2014-04-21 22:34:43 -07:00
fjy 594bb65ba6 [maven-release-plugin] prepare release druid-0.6.98 2014-04-21 22:34:38 -07:00
fjy 357cd66f66 [maven-release-plugin] prepare for next development iteration 2014-04-21 22:26:28 -07:00
fjy 93ed56f680 [maven-release-plugin] prepare release druid-0.6.97 2014-04-21 22:26:23 -07:00
fjy 310073685d [maven-release-plugin] prepare for next development iteration 2014-04-21 12:16:39 -07:00
fjy 1778d9adf4 [maven-release-plugin] prepare release druid-0.6.96 2014-04-21 12:16:35 -07:00
fjy 65db875d68 [maven-release-plugin] prepare for next development iteration 2014-04-18 17:44:36 -07:00
fjy 2d3eebe995 [maven-release-plugin] prepare release druid-0.6.95 2014-04-18 17:44:32 -07:00
Gian Merlino 265ac37cdc [maven-release-plugin] prepare for next development iteration 2014-04-18 11:53:43 -07:00
Gian Merlino 5162864731 [maven-release-plugin] prepare release druid-0.6.94 2014-04-18 11:53:38 -07:00
fjy c00fb1d08e Merge pull request #445 from metamx/hadoop-version-update
Hadoop version update
2014-04-17 19:16:44 -06:00
fjy 1fcb3e01c3 [maven-release-plugin] prepare for next development iteration 2014-04-17 15:30:30 -07:00
fjy e9b77c4434 [maven-release-plugin] prepare release druid-0.6.93 2014-04-17 15:30:26 -07:00
fjy 66a8ff9390 [maven-release-plugin] prepare for next development iteration 2014-04-16 11:40:35 -07:00
fjy 6621c4f321 [maven-release-plugin] prepare release druid-0.6.92 2014-04-16 11:40:30 -07:00
fjy b26a40aeaf [maven-release-plugin] prepare for next development iteration 2014-04-16 11:26:34 -07:00
fjy 8ee8927267 [maven-release-plugin] prepare release druid-0.6.91 2014-04-16 11:26:28 -07:00
fjy 6893282a65 [maven-release-plugin] prepare for next development iteration 2014-04-15 14:26:57 -07:00
fjy 7e9166d20c [maven-release-plugin] prepare release druid-0.6.90 2014-04-15 14:26:53 -07:00
fjy db5f04c84d [maven-release-plugin] prepare for next development iteration 2014-04-10 15:39:41 -07:00
fjy 87ef64f577 [maven-release-plugin] prepare release druid-0.6.89 2014-04-10 15:39:36 -07:00
fjy b273f1b101 [maven-release-plugin] prepare for next development iteration 2014-04-10 12:56:20 -07:00
fjy 9019990d94 [maven-release-plugin] prepare release druid-0.6.88 2014-04-10 12:56:16 -07:00
fjy 57bf8faa82 [maven-release-plugin] prepare for next development iteration 2014-04-10 11:33:06 -07:00
fjy 20c7b73269 [maven-release-plugin] prepare release druid-0.6.87 2014-04-10 11:33:02 -07:00
fjy 6209803d50 [maven-release-plugin] prepare for next development iteration 2014-04-08 16:27:44 -07:00
fjy ac9d20af47 [maven-release-plugin] prepare release druid-0.6.86 2014-04-08 16:27:40 -07:00
fjy 29c3db92b5 [maven-release-plugin] prepare for next development iteration 2014-04-08 11:44:45 -07:00
fjy d16ff98ef3 [maven-release-plugin] prepare release druid-0.6.85 2014-04-08 11:44:40 -07:00
fjy 8e3bcc8fc3 [maven-release-plugin] prepare for next development iteration 2014-04-07 14:38:55 -07:00
fjy e1e81cfeac [maven-release-plugin] prepare release druid-0.6.84 2014-04-07 14:38:51 -07:00
fjy bfb66691b9 [maven-release-plugin] prepare for next development iteration 2014-04-07 12:45:28 -07:00
fjy f612b7cc64 [maven-release-plugin] prepare release druid-0.6.83 2014-04-07 12:45:20 -07:00
Crystark 40a6804192 Support for postgresql
I think it was the last request using 'end' missing the postgresql support.
2014-04-07 17:37:03 +02:00
fjy 8138d96f9d [maven-release-plugin] prepare for next development iteration 2014-04-03 17:21:14 -07:00
fjy 4619e498c3 [maven-release-plugin] prepare release druid-0.6.82 2014-04-03 17:21:10 -07:00
fjy edba3ba40e [maven-release-plugin] prepare for next development iteration 2014-04-02 22:24:36 -07:00
fjy 0f0e525a75 [maven-release-plugin] prepare release druid-0.6.81 2014-04-02 22:24:32 -07:00
fjy b0bf08554a fix broken build 2014-04-02 22:22:42 -07:00
fjy 133c624f69 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:33:10 -07:00
fjy 4e2ac3234c [maven-release-plugin] prepare release druid-0.6.79 2014-04-02 21:33:05 -07:00
fjy 6bab22ef71 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:08:18 -07:00
fjy 93e19b62e6 [maven-release-plugin] prepare release druid-0.6.78 2014-04-02 21:08:14 -07:00
fjy 6cd5a76983 [maven-release-plugin] prepare for next development iteration 2014-04-02 17:33:26 -07:00
fjy d1e7b98177 [maven-release-plugin] prepare release druid-0.6.77 2014-04-02 17:33:19 -07:00
Xavier Léauté 74c5d9889b [maven-release-plugin] prepare for next development iteration 2014-03-31 16:07:31 -07:00
Xavier Léauté 0845cc4078 [maven-release-plugin] prepare release druid-0.6.76 2014-03-31 16:07:25 -07:00
fjy 652506d1bd [maven-release-plugin] prepare for next development iteration 2014-03-27 18:03:55 -07:00
fjy 7fa62cd9c7 [maven-release-plugin] prepare release druid-0.6.75 2014-03-27 18:03:51 -07:00
nishantmonu51 a24fc84d0d Merge branch 'master' into hadoop-version-update 2014-03-27 03:32:11 +05:30
nishantmonu51 a9a6682a0e Upgrade to Hadoop 2.3.0 2014-03-26 11:43:31 +05:30
fjy 7e54c6a359 [maven-release-plugin] prepare for next development iteration 2014-03-25 13:43:25 -07:00
fjy 0baf95098d [maven-release-plugin] prepare release druid-0.6.74 2014-03-25 13:43:21 -07:00
fjy e523bfc237 [maven-release-plugin] prepare for next development iteration 2014-03-21 11:07:40 -07:00
fjy 6fbc3b15a7 [maven-release-plugin] prepare release druid-0.6.73 2014-03-21 11:07:34 -07:00
fjy 03851101f0 [maven-release-plugin] prepare for next development iteration 2014-03-18 08:12:51 -07:00
fjy 508d892ba1 [maven-release-plugin] prepare release druid-0.6.72 2014-03-18 08:12:44 -07:00
fjy 294f15d624 [maven-release-plugin] prepare for next development iteration 2014-03-17 21:44:17 -07:00
fjy 199efa049a [maven-release-plugin] prepare release druid-0.6.71 2014-03-17 21:44:11 -07:00
Xavier Léauté b9fe12977e [maven-release-plugin] prepare for next development iteration 2014-03-17 13:57:10 -07:00
Xavier Léauté 0276223db1 [maven-release-plugin] prepare release druid-0.6.70 2014-03-17 13:57:06 -07:00
fjy 2adcf07f5f Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-03-17 10:59:31 -07:00
fjy 8e5cbca2ee [maven-release-plugin] prepare for next development iteration 2014-03-14 15:16:55 -07:00
fjy 852d167eaf [maven-release-plugin] prepare release druid-0.6.69 2014-03-14 15:16:50 -07:00
fjy 7a2d0850e3 [maven-release-plugin] prepare for next development iteration 2014-03-14 15:06:54 -07:00
fjy 2646b5421b [maven-release-plugin] prepare release druid-0.6.68 2014-03-14 15:06:50 -07:00