1249 Commits

Author	SHA1	Message	Date
Xavier Léauté	30183d3b4d	update druid-api for json parsing improvements	2014-10-07 13:25:02 -07:00
fjy	f1d37d569c	doc fixes	2014-10-07 13:01:41 -07:00
Glenn Nethercutt	858aff396c	move to latest AWS sdk (1.8.11)	2014-10-03 23:06:42 -04: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
jisookim0513	9d7b5d9b0f	fixed javadoc; fixed pom files; deleted unnecessary class	2014-09-30 13:47:35 -07:00
nishantmonu51	358ff915bb	fix merge conflicts	2014-09-30 22:19:18 +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
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	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
Xavier Léauté	e6b3e37aeb	update java-util	2014-09-23 09:36:21 -07:00
nishantmonu51	b38a9bc1c1	upgrade druid-api	2014-09-22 22:15:00 +05:30
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
fjy	fbeb57d261	prepare for next release	2014-09-16 15:18:27 -07:00
fjy	1ab2662772	have better dimension exclusions	2014-09-15 16:52:07 -07:00
fjy	d3f04d4fbe	update druid api ver	2014-09-15 12:43:57 -07:00
fjy	1615e1ac63	update druid api ver	2014-09-15 12:43:35 -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
nishantmonu51	178f002f05	indexing working with mapdb	2014-09-09 15:59:33 +05:30
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
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é	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
fjy	08b6a2677d	Merge pull request #710 from metamx/update-druid-api ... Update Druid api	2014-08-28 07:12:57 -06:00
nishantmonu51	df06874f84	Update Druid api ... Fixes DelimitedParseSpec serialization	2014-08-28 18:24:30 +05:30
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
Xavier Léauté	248e6ed74e	auto-version submodules for release	2014-08-27 12:19:56 -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	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	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
nishantmonu51	1b0a72751b	Add support for LongColumn	2014-08-13 08:52:36 +05:30