532 Commits

Author SHA1 Message Date
cheddar
fe5627e119 1) Left some log lines in the tests... That's no good. 2013-05-14 16:59:34 -05:00
cheddar
8bd19e9d04 1) Take in g9yuayon's pull request, fix merge conflicts and formatting 2013-05-14 16:55:43 -05:00
fjy
1e14ea7fab Merge branch 'master' into improve-bard 2013-05-14 14:53:05 -07:00
fjy
e8ab0893ff fix column size reporting 2013-05-14 14:52:38 -07:00
Gian Merlino
83fa572ab3 [maven-release-plugin] prepare for next development iteration 2013-05-14 14:43:38 -07:00
Gian Merlino
ecf52f4265 [maven-release-plugin] prepare release druid-0.4.14 2013-05-14 14:43:29 -07:00
Gian Merlino
8999080801 [maven-release-plugin] prepare for next development iteration 2013-05-14 13:59:17 -07:00
Gian Merlino
55a986bc7d [maven-release-plugin] prepare release druid-0.4.13 2013-05-14 13:59:07 -07:00
fjy
4c93cecd31 Merge branch 'master' into improve-bard 2013-05-14 11:10:52 -07:00
fjy
7d34710edf [maven-release-plugin] prepare for next development iteration 2013-05-13 17:31:11 -07:00
fjy
d8d7d92f65 [maven-release-plugin] prepare release druid-0.4.12 2013-05-13 17:31:02 -07:00
fjy
2c45f33497 [maven-release-plugin] prepare for next development iteration 2013-05-13 12:39:09 -07:00
fjy
57e1cf5f1d [maven-release-plugin] prepare release druid-0.4.11 2013-05-13 12:39:01 -07:00
fjy
82c4cd5641 [maven-release-plugin] prepare for next development iteration 2013-05-13 11:08:39 -07:00
fjy
1860104abe [maven-release-plugin] prepare release druid-0.4.10 2013-05-13 11:08:29 -07:00
fjy
1a978fe525 fix predicates 2013-05-12 15:26:19 -07:00
fjy
219a8d7d05 [maven-release-plugin] prepare for next development iteration 2013-05-12 15:19:19 -07:00
fjy
64febd47d7 [maven-release-plugin] prepare release druid-0.4.9 2013-05-12 15:19:12 -07:00
fjy
bcfeac2d8c fix NPE 2013-05-12 15:14:57 -07:00
Brian O'Neill
8e0c0e6d47 Switched to default the aws properties. 2013-05-08 16:02:11 -04:00
Brian O'Neill
3eb0f4dfca Fix hierarchy in Pusher (to use CassandraStorage superclass) 2013-05-08 15:50:58 -04:00
fjy
e1deaccd87 Merge branch 'master' into spatial 2013-05-08 11:46:46 -07:00
xvrl
8388d0593a [maven-release-plugin] prepare for next development iteration 2013-05-08 10:56:22 -07:00
xvrl
79665d325f [maven-release-plugin] prepare release druid-0.4.8 2013-05-08 10:56:12 -07:00
fjy
986bb2482d Merge branch 'master' into spatial 2013-05-08 10:37:38 -07:00
fjy
e20aabd7a9 [maven-release-plugin] prepare for next development iteration 2013-05-08 10:17:25 -07:00
fjy
758baa913b [maven-release-plugin] prepare release druid-0.4.7 2013-05-08 10:17:17 -07:00
fjy
43d3c53806 fix order by double sum agg 2013-05-08 10:14:40 -07:00
fjy
32f82364f1 Merge branch 'master' into spatial 2013-05-07 14:12:05 -07:00
fjy
913cf37060 [maven-release-plugin] prepare for next development iteration 2013-05-07 09:32:54 -07:00
fjy
d883001aaa [maven-release-plugin] prepare release druid-0.4.6 2013-05-07 09:32:46 -07:00
Brian O'Neill
863b8808cc Merge branch 'master' of https://github.com/metamx/druid into cassandra-segments 2013-05-07 11:36:49 -04:00
Brian O'Neill
41e9f8fcb4 Working Push & Pull. 2013-05-07 11:35:14 -04:00
Brian O'Neill
8e8736291f Added puller. 2013-05-06 23:14:18 -04:00
cheddar
01c1257cee Merge pull request #134 from metamx/event-push
Event push
2013-05-06 15:10:44 -07:00
Brian O'Neill
142668cda5 Merge branch 'master' of https://github.com/metamx/druid into cassandra-segments 2013-05-06 17:54:56 -04:00
Brian O'Neill
79d802fede Working data segment pushed for C*. 2013-05-06 17:54:12 -04:00
fjy
f7dfea056b [maven-release-plugin] prepare for next development iteration 2013-05-06 14:30:11 -07:00
fjy
a4bd6bc843 [maven-release-plugin] prepare release druid-0.4.5 2013-05-06 14:30:03 -07:00
fjy
f34d73aaff fix pom versions because of failed release 2013-05-06 14:27:22 -07:00
fjy
0eb7b248d9 [maven-release-plugin] prepare release druid-0.4.4 2013-05-06 14:24:16 -07:00
fjy
8902986069 Merge branch 'master' into spatial 2013-05-03 23:09:30 -07:00
fjy
344a2b5d24 numerous bug fixes and improvements according to code review 2013-05-03 23:09:05 -07:00
cheddar
de720e6e1a [maven-release-plugin] prepare for next development iteration 2013-05-03 18:41:39 -05:00
cheddar
ba2b2fb39f [maven-release-plugin] prepare release druid-0.4.3 2013-05-03 18:41:33 -05:00
fjy
3417c50e98 Merge branch 'master' into spatial
Conflicts:
	client/src/main/java/com/metamx/druid/query/group/DefaultLimitSpec.java
	client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java
	client/src/main/java/com/metamx/druid/query/group/LimitSpec.java
	pom.xml
2013-05-03 16:20:37 -07:00
cheddar
665f3ef0fd 1) Unit tests for order by and limit stuff for groupBy queries
2) Adjustments to order by and limit stuff in light of unit tests-n-stuff
2013-05-03 17:47:18 -05:00
fjy
d57141f46e checking stuff in but stuff not really working yet 2013-05-03 10:35:26 -07:00
cheddar
c89f4cc85f [maven-release-plugin] prepare for next development iteration 2013-05-03 12:17:05 -05:00
cheddar
4fef7c2c43 [maven-release-plugin] prepare release druid-0.4.2 2013-05-03 12:16:57 -05:00