Commit Graph

1140 Commits

Author SHA1 Message Date
fjy 8ee4d12562 Refactor structure for examples and extensions 2014-11-21 14:45:24 -08:00
Fangjin Yang 590d31799e Merge pull request #876 from metamx/remove-backwards-compatible
Remove backwards compatible
2014-11-19 14:33:14 -07:00
Charles Allen dc66e1708e Added src jar build to maven poms and re-formatted to conform to style guidelines. 2014-11-18 09:05:30 -08:00
nishantmonu51 0c2d06475d merge from master 2014-11-17 19:19:18 +05:30
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é cbe6ea67ee more druid.db -> druid.metadata.storage and allow multiple storage extensions loaded at once 2014-10-31 12:03:04 -07:00
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 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 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é 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
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
jisookim0513 273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -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é d4795ce927 fix missing charsets 2014-09-15 12:53:40 -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
xvrl fff16b613b update link 2014-09-09 10:12:13 -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
fjy f473e62f1f Merge pull request #714 from metamx/cleanup-javadocs
Cleanup javadocs
2014-09-04 12:28:10 -06:00
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
Xavier Léauté 0793a5aee6 [maven-release-plugin] prepare release druid-0.6.149 2014-08-29 10:43:15 -07:00
Xavier Léauté 1d6842c7f0 [maven-release-plugin] prepare for next development iteration 2014-08-27 12:22:53 -07:00
Xavier Léauté 575951f99a [maven-release-plugin] prepare release druid-0.6.148 2014-08-27 12:22:49 -07:00
fjy 00f7077f50 [maven-release-plugin] prepare for next development iteration 2014-08-22 08:28:56 -07:00
fjy df488563e4 [maven-release-plugin] prepare release druid-0.6.147 2014-08-22 08:28:51 -07:00
fjy 7ca3b2d27c update docs 2014-08-22 08:26:25 -07:00
fjy df48b48e35 [maven-release-plugin] prepare for next development iteration 2014-08-21 12:50:33 -07:00
fjy 4f0b994037 [maven-release-plugin] prepare release druid-0.6.146 2014-08-21 12:50:30 -07:00
fjy 85ff054726 prepare for next release 2014-08-21 12:47:55 -07:00
fjy 51988be776 [maven-release-plugin] prepare for next development iteration 2014-08-14 14:59:00 -07:00
fjy 2830028092 [maven-release-plugin] prepare release druid-0.6.145 2014-08-14 14:58:57 -07:00
fjy 29d14b772f prepare for next release 2014-08-14 14:56:27 -07:00
Amy Troschinetz 71b8db631c Updates Cassandra example documentation.
Updates the required properties to enable Cassandra as deep storage.
Also adds more information about how to create the required keystore,
and which properties files need to be modified to support Cassandra.
Also adds syntax highlighting to the provided example code.

Additionally, moves Cassandra Deep Storage documentation out into the
actual documentation hierarchy with appropriate linkage. A stub
README.md is left in the example directory to provide a useful landing
page for existing weblinks to the original documentation.
2014-08-14 16:36:36 -05:00
Xavier Léauté 161c2f0fff Merge branch '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
	services/pom.xml
2014-08-12 14:00:21 -07:00
fjy 4e3f4fbc22 [maven-release-plugin] prepare for next development iteration 2014-08-12 13:24:55 -07:00
fjy f3aafc246c [maven-release-plugin] prepare release druid-0.6.144 2014-08-12 13:24:50 -07:00
fjy 79f6486b88 prepare for next release 2014-08-12 13:22:23 -07:00
fjy 0cff63c7c6 [maven-release-plugin] prepare for next development iteration 2014-08-09 19:36:11 -07:00
fjy 724562b181 [maven-release-plugin] prepare release druid-0.6.143 2014-08-09 19:36:05 -07:00
fjy bd98e0dd29 prep next release 2014-08-09 19:33:31 -07:00
fjy d58ae945a4 [maven-release-plugin] prepare for next development iteration 2014-08-08 16:22:38 -07:00
fjy d240479133 [maven-release-plugin] prepare release druid-0.6.142 2014-08-08 16:22:34 -07:00
fjy 8998700760 prepare for next release 2014-08-08 16:19:45 -07:00
fjy 199f2b1683 [maven-release-plugin] prepare for next development iteration 2014-08-08 15:53:53 -07:00
fjy 29a077d893 [maven-release-plugin] prepare release druid-0.6.141 2014-08-08 15:53:49 -07:00
fjy 8e87cae990 prepare for next rel 2014-08-08 15:51:22 -07:00
fjy 958792db5c [maven-release-plugin] prepare for next development iteration 2014-08-08 15:16:38 -07:00
fjy 4482e1b7d8 [maven-release-plugin] prepare release druid-0.6.140 2014-08-08 15:16:34 -07:00
fjy 35937132a7 prep next release 2014-08-08 14:35:22 -07:00
fjy c860de43cf fix dependencies 2014-08-08 13:46:25 -07:00
fjy f3970bb1d8 Merge branch 'master' into new-init
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
2014-08-08 12:44:29 -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 bb44056810 prepare for next release 2014-08-08 11:38:17 -07:00
fjy 7624bb5ea3 Merge branch 'master' into new-init
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	server/src/main/java/io/druid/initialization/Initialization.java
2014-08-06 15:47:22 -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 57a979ef19 prepare for next release 2014-08-06 13:31:27 -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 362be7a2c0 prepare for next release 2014-08-01 10:12:03 -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
fjy e5ce9b4a2a prepare for next release 2014-07-31 14:05:56 -07:00
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 625377fdd2 prep next rel 2014-07-29 22:00:11 -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 7803ca07e7 fix broken chat handler 2014-07-29 17:58:21 -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 89149b5fcb prepare for next release 2014-07-29 17:38:19 -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
fjy c646648319 fix examples start port 2014-07-02 10:07:04 -07:00
fjy fdb39d57a3 fix another doc problem 2014-06-19 13:10:08 -07: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
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 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 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 c8689507c8 prepare for next release 2014-06-05 10:01:25 -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
fjy e3941a2890 prepare for next rel 2014-06-04 20:19:50 -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 612624fb89 prepare for next release 2014-06-04 16:47:54 -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 22bbe037a7 prepare for next release 2014-06-04 09:34:29 -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 abac529116 prepare for next release 2014-06-02 10:49:54 -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 9adf80da7c prepare for next release 2014-05-29 17:24:02 -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
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é 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 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 79e6d4eb56 Merge pull request #528 from metamx/union-query-source
Union query source
2014-05-06 14:13:33 -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
nishantmonu51 477e01daf7 review comments 2014-05-02 15:21:06 +05:30
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 b8184821b5 update docs for next rel 2014-05-01 15:07:14 -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
fjy 268c9aa807 update docs version 2014-04-30 13:11:46 -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 3fd651c235 fix the rule again, update docs, and prepare for next release 2014-04-30 10:43:30 -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 0790303b4a update docs and prepare for next release 2014-04-30 10:23:35 -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
Xavier Léauté 55d316b1ff update docs version 2014-04-24 17:18:27 -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 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
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 1fcb3e01c3 [maven-release-plugin] prepare for next development iteration 2014-04-17 15:30:30 -07:00