636 Commits

Author SHA1 Message Date
fjy
eec07ad45f Merge branch 'master' of github.com:metamx/druid
Conflicts:
	services/src/main/java/io/druid/cli/CliHadoopIndexer.java
2014-03-25 10:04:14 -07:00
fjy
b6dd2fae64 update some comments on standalone hadoop indexer 2014-03-25 10:03:40 -07:00
nishantmonu51
fe7a184096 review comments 2014-03-25 17:02:36 +05:30
nishantmonu51
0ba72ffb2b merge from master 2014-03-25 15:43:05 +05:30
nishantmonu51
6a34c09e05 Merge branch 'master' into compute-populate-cache 2014-03-25 13:23:00 +05:30
fjy
5ebb2d27e3 fix hadoop 2014-03-24 18:43:31 -07:00
fjy
75ec8bed9a address code review comments 2014-03-24 14:53:30 -07:00
fjy
fcd7522596 Merge branch 'master' into router-node 2014-03-24 13:43:52 -07:00
fjy
55169175de prepare for next release 2014-03-21 11:05:54 -07:00
nishantmonu51
69e9b7a6c5 merge changes from master 2014-03-20 20:23:58 +05:30
fjy
ab2524ba0a add router node 2014-03-18 13:44:29 -07:00
fjy
804a4051fa prepare for next rel 2014-03-18 08:10:59 -07:00
fjy
1d1ec1d855 clean up some defaults and prepare for next release 2014-03-17 21:41:34 -07:00
fjy
2adcf07f5f Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-03-17 10:59:31 -07:00
nishantmonu51
468e8e0b31 Memcache changes 2014-03-17 18:54:30 +05:30
fjy
f1da044cfa fix another breaking endpoint in druid coordinator 2014-03-14 15:15:08 -07:00
fjy
f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00
fjy
f0fdfbb2f7 fix broken constant post agg 2014-03-14 14:54:52 -07:00
fjy
b3fb2fea9c prepare for next release 2014-03-14 10:57:43 -07:00
nishantmonu51
04f3d0a13a fix cli hadoop indexer
* run determine partitions job using CLI
2014-03-11 16:36:19 +05:30
fjy
ae2dc6506c fix broken granularity 2014-03-10 15:03:43 -07:00
fjy
243af486cf prepare for next release 2014-03-10 13:24:53 -07:00
fjy
e1fac64298 prepare for next release 2014-03-06 12:53:05 -08:00
fjy
7b0b90a860 Merge branch 'master' of github.com:metamx/druid into new-schema 2014-02-20 16:12:31 -08:00
fjy
5d2367f0fd unit tests pass at this point 2014-02-20 15:52:12 -08:00
fjy
ab83cba790 Merge pull request #393 from metamx/group-by-improvements
Group by memory usage improvements
2014-02-19 19:52:37 -07:00
fjy
fb93448e9d prepare for next release because my last one failzored out of bad internetz 2014-02-14 15:22:27 -08:00
fjy
1a8f9f2e12 prepare for next release 2014-02-14 15:07:44 -08:00
fjy
a986166b9c prepare for next release 2014-02-12 20:01:05 -08:00
nishantmonu51
3302cff6db groupBy improvements 2014-02-12 00:51:10 +05:30
fjy
2497bd2e85 prepare for next release 2014-02-07 13:04:34 -08:00
fjy
c8b350270f prepare for next release 2014-02-07 11:54:56 -08:00
fjy
8edf0cf136 more backwards compatability fix 2014-01-26 21:27:34 +08:00
fjy
158a725985 fix backwards compat issues 2014-01-26 20:07:09 +08:00
fjy
f3e1cbc423 fix according to code review 2014-01-21 16:26:28 -08:00
fjy
e2ea2ec7fd Merge branch 'master' into az
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java
2014-01-20 15:10:13 -08:00
fjy
215584891e Merge branch 'master' into moar-endpoints 2014-01-20 13:06:45 -08:00
fjy
6404967994 fixes 2014-01-20 13:05:05 -08:00
fjy
8d01a46d02 actually register resources 2014-01-17 18:01:09 -08:00
fjy
f898c29e20 fix batch indexing and prepare for next release 2014-01-17 15:52:04 -08:00
fjy
0ceda034cd fix dependency issue and prepare for next release 2014-01-14 17:34:02 -08:00
fjy
187bb84b45 prepare for next release 2014-01-14 16:07:05 -08:00
fjy
9184906c39 prepare for next release 2014-01-14 09:54:42 -08:00
fjy
e8d61ffe99 prepare for next release 2014-01-13 18:02:24 -08:00
fjy
f123a14373 Merge branch 'master' into az
Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java
2014-01-09 19:09:38 -08:00
Xavier Léauté
632d6b0a78 make server selection configurable, add back random server selection 2014-01-09 14:37:33 -08:00
fjy
f44509b530 queries working at this point, tests pass, still need more tests and fix rules interface 2014-01-07 16:24:53 -08:00
fjy
e11952f3b6 bridge is kinda working for mastery stuff right now, tests pass 2014-01-06 17:01:50 -08:00
Xavier Léauté
95d92915bf more tests for Initialization + dependency cleanup 2013-12-30 16:31:10 -08:00
Gian Merlino
bbe1b82347 Update versions 2013-12-20 12:26:27 -08:00