Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,615 Commits 113 Branches 506 Tags 732 MiB
Commit Graph

994 Commits

Author SHA1 Message Date
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
Xavier Léauté 4c4abbbb0c update maven-release-plugin to 2.5 2014-06-17 09:07:32 -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
Gian Merlino 2a88f8c4ce Downgrade guice to 4.0-beta. 2014-06-16 16:36:05 -07:00
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 5bd4ad3f0f address code review 2014-06-13 11:29:49 -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
xvrl ada2d92c16 Merge pull request #576 from metamx/query-cancellation 
Query cancellation & timeout
 2014-06-11 12:18:43 -07:00
Xavier Léauté ababbcadfd fix package groupId 2014-06-10 15:01:44 -07:00
xvrl 1b5095ac57 Merge pull request #588 from metamx/resolve-validator 
add dependencies for validator error
 2014-06-10 14:05:29 -07:00
Xavier Léauté ae0e36f3eb warn glacier objects cannot be moved 2014-06-10 11:22:10 -07:00
Xavier Léauté d01f272a7a forward cancellation in direct druid client 2014-06-10 10:36:38 -07:00
fjy a3e86f7094 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
 2014-06-09 16:01:53 -07:00
fjy 7233fce50c refactor examples to use global runtime 2014-06-09 15:59:44 -07:00
fjy eb5034ce7f update dep version 2014-06-09 15:33:24 -07:00
fjy d3f2faef92 address code review 2014-06-09 15:32:22 -07:00
fjy 55f1e2e2a7 add dependencies for validator error 2014-06-06 14:19:55 -07:00
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
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
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 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 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 9dddb09a0c remove druid-hll 2014-06-02 10:51:44 -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 8c9a27ab08 Merge pull request #559 from metamx/upgrade-jetty 
upgrade jetty version
 2014-05-22 10:43:19 -06:00
Tugdual Saunier 9e9d326dda Fixed duplicated dependency 2014-05-22 15:50:12 +01:00
nishantmonu51 5155c5b062 upgrade jetty version 
upgrade jetty version to 9.1.5.v20140505
 2014-05-21 20:19:59 +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é 61ceadbd57 update druid-api 2014-05-19 13:53:25 -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
Xavier Léauté b51f0f7837 update java-util and add more merge sequence tests 2014-05-15 16:19:12 -07:00
nishantmonu51 26569f4b7f fix jetty threads getting stuck 
Fix Jetty threads getting stuck on exceptions
 2014-05-10 02:12:19 +05:30
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 9d35490cdf Revert "Merge pull request #495 from metamx/dim-extraction-null-values" 
This reverts commit 76437379d7, reversing
changes made to 79e6d4eb56.

Conflicts:
	pom.xml
 2014-05-07 12:32:51 -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 d75cc7b9b8 fix more serde 2014-05-06 15:17:38 -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
fjy ad54f150ec fix broken UT with bad api version 2014-05-06 13:51:22 -07:00
fjy 76437379d7 Merge pull request #495 from metamx/dim-extraction-null-values 
Support null values in DimExtractionFn in topN and groupBy
 2014-05-06 14:17:55 -06: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
fjy 8af927e2a7 Merge pull request #516 from metamx/alphanumeric-topn 
Alpha-numeric sorting for topN
 2014-05-05 17:09:24 -06: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 7561f375b2 exclude old netty version 2014-05-01 14:57:41 -07:00
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
xvrl bcbade3a16 Merge pull request #525 from metamx/update-java-util 
update java-util
 2014-04-30 13:04:14 -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
Xavier Léauté c2f615a05a update java-util 2014-04-30 10:44:02 -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 68242950f7 make coordinator routing smarter and period load rule explicit 2014-04-30 10:17:40 -07:00
Xavier Léauté bb62a44e24 alphanumeric topN 2014-04-28 09:42:43 -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 c4cefb667e prepare for next release 2014-04-24 11:45:25 -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 b653ea0530 prepare for next release 2014-04-22 17:07:11 -07:00
fjy 8fd39c63d5 Better handle null adapters and NPEs in the CQE 2014-04-22 12:47:53 -07:00
fjy 560045ddd2 update emitter version 2014-04-22 11:21:54 -07:00
Xavier Léauté 52f575025b requires druid-api update 2014-04-21 22:37:31 -07: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 c0ddfc0872 update versions 2014-04-21 22:32:53 -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 04009b4195 prepare for next release 2014-04-21 12:14:50 -07:00
nishantmonu51 f20d3b2895 merge changes from master 2014-04-21 21:43:44 +05:30
nishantmonu51 e8b993b765 fix by segment results 
1) fix class cast in by segment results
2) exclude old netty version coming from curator
 2014-04-21 21:26:34 +05:30
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
fjy 517d3d2682 prepare for next release 2014-04-18 17:42:47 -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 ad60a4a5fd prepare for next release 2014-04-17 15:28:46 -07:00
Xavier Léauté 9ef65f1ded update http-client, fixes race conditions 2014-04-17 10:02:43 -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 795d506939 internet disconnected and last build failed 2014-04-16 11:32:32 -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 7f4e7d2b8f prepare for next release 2014-04-16 11:24:45 -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
Xavier Léauté 3117f439e0 update to jetty 9.1.4 to fix bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=430654 2014-04-15 14:02:18 -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
Xavier Léauté 3e6ffbd5ac populate cache on sequence close 2014-04-08 17:14:17 -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 7db756f819 prepare for next release 2014-04-08 16:25:59 -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 a4df23f092 prepare for next release 2014-04-08 11:42:59 -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 4ef2bbbfc1 prepare for next release 2014-04-07 14:37:02 -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
fjy 2e9579a146 prepare for next release 2014-04-07 12:43:30 -07: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 e53d107472 revert broken cache 2014-04-02 22:12:22 -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 ea9f31bbe0 learn to math and prepare for next release 2014-04-02 21:31:17 -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 f185d215e1 fix jetty default thread pool size for jetty 9 and prepare for next release 2014-04-02 21:01:07 -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
fjy fc94b847c3 prepare for next release 2014-04-02 17:31:19 -07:00
fjy 43a0554179 Merge pull request #455 from metamx/async 
Asynchronous servlet for query forwarding
 2014-04-02 18:05:49 -06:00
fjy f88df4a7b0 remove jetty examples 2014-04-01 17:53:39 -07:00
fjy 6952eb7878 asynch servlet for query forwarding 2014-04-01 17:51:28 -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 55169175de prepare for next release 2014-03-21 11:05:54 -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 804a4051fa prepare for next rel 2014-03-18 08:10:59 -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
fjy 1d1ec1d855 clean up some defaults and prepare for next release 2014-03-17 21:41:34 -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
Xavier Léauté cb40fcc469 fix maven release plugin with recent versions of git 2014-03-17 13:52:22 -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 f1da044cfa fix another breaking endpoint in druid coordinator 2014-03-14 15:15:08 -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
fjy f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00