850 Commits

Author SHA1 Message Date
fjy
de8cb55260 Merge branch 'master' into rejigger-cache
Conflicts:
	pom.xml
2014-07-16 13:37:20 -07:00
fjy
2f90bfcf9a rejiggering the cache for groupBy and select 2014-07-15 12:12:33 -07:00
nishantmonu51
a31376ee83 point to correct version 2014-07-10 12:23:20 +05:30
nishantmonu51
a12688bc8b fix partitionNum calculation & remove extra sorting 2014-07-10 12:21:27 +05:30
nishantmonu51
fa43049240 review comments & pom changes 2014-07-10 11:48:46 +05:30
Xavier Léauté
70ae6e1fcd Approximate Histogram Module 2014-07-01 15:10:23 -07:00
fjy
b3aad48f47 remove snapshot dep 2014-06-18 14:43:57 -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
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
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