1028 Commits

Author	SHA1	Message	Date
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
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
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é	d501b052ea	remove unused columnConfig	2014-09-15 13:02:47 -07:00
Xavier Léauté	e57e2d97ba	make constants final	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
fjy	fec7b43fcb	make making v9 segments something completely configurable	2014-09-10 15:28:30 -07:00
fjy	351afb8be7	allow legacy index generator	2014-09-09 17:04:35 -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
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	12f4147df5	switch index gen job to use logging indicator	2014-08-21 13:28:15 -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	d64879ccca	more cleanup	2014-08-20 13:22:42 -07:00
fjy	bb73b2556e	fix compilation	2014-08-20 13:17:00 -07:00
fjy	92f26d9a1f	cleanup rowflushboundary	2014-08-20 13:09:37 -07:00
nishantmonu51	79ff993b31	increase default buffer size to 512m	2014-08-20 22:15:06 +05:30
nishantmonu51	33354cf7fe	replace maxRowsInMemory with BufferSize	2014-08-20 20:59:44 +05:30
fjy	88a904e0b3	address cr about progress ind	2014-08-19 12:59:01 -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	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
nishantmonu51	c6712739dc	merge changes from druid-0.7.x	2014-08-12 15:47:42 +05:30
nishantmonu51	9598a524a8	review comment - move index closure to finally	2014-08-12 14:58:55 +05:30