Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-11 12:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,460 Commits 116 Branches 508 Tags
Commit Graph

231 Commits

Author SHA1 Message Date
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
Xavier Léauté
c506d014bf fix link to docs 2014-06-04 12:55:48 -07:00
fjy
bb4105ed1a fix broken standalone hadoop ingestion 2014-06-04 09:23:46 -07:00
fjy
c97768b27d Merge branch 'master' of github.com:metamx/druid into new-guava 2014-06-04 09:12:59 -07:00
nishantmonu51
d8338fc51d fix backwards compatibility 2014-06-04 16:40:06 +05:30
fjy
77ec4df797 update guava, java-util, and druid-api 2014-06-03 13:43:38 -07:00
fjy
49a8dc9e3e fix backwards incompatiable change with broker.balancer config 2014-05-28 13:27:43 -07:00
fjy
b6fb4245aa Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDriverConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfigBuilder.java
	pom.xml
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java
 2014-05-06 14:32:51 -07:00
fjy
544c0f08f6 Merge pull request #459 from metamx/move-firehose 
Move the event receiver firehose such that standalone realtime nodes can use it
 2014-05-05 17:09:43 -06:00
fjy
e90eb4b83a add custom tier selector 2014-04-28 15:31:15 -07:00
fjy
9de170540b fix bug with selection in cli 2014-04-28 14:00:53 -07:00
fjy
3c3daf452e Smarter server selection at the router level 2014-04-28 13:58:10 -07:00
fjy
171d20d52d Merge branch 'move-firehose' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:19 -07:00
fjy
eef034ca7e Merge branch 'master' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:08 -07:00
fjy
76e0a48527 Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DbUpdaterJob.java
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-04-25 14:03:28 -07:00
Gian Merlino
8d650ae131 PullDependencies changes. 
- Pull default Hadoop version by default.
- Allow additional coordinates on the command line.
 2014-04-22 14:33:53 -07:00
fjy
c00fb1d08e Merge pull request #445 from metamx/hadoop-version-update 
Hadoop version update
 2014-04-17 19:16:44 -06:00
fjy
a87213e15f point code docs to latest instead of a version 2014-04-16 10:50:39 -07:00
fjy
51e2da9d8d use a separate annotation for the router, less confusing 2014-04-16 10:08:58 -07:00
fjy
24a0268036 cleanup code in router and add forwarding for get requests 2014-04-16 09:36:18 -07:00
fjy
508cf6a4f7 Merge branch 'master' of github.com:metamx/druid 2014-04-15 14:23:58 -07:00
fjy
9b06b6aa58 misc fixes for router 2014-04-15 14:23:54 -07:00
Xavier Léauté
077dd7c589 enable cache monitor on computes by default 2014-04-14 16:11:12 -07:00
fjy
88c592ccaa add more meaningful request logging 2014-04-10 10:37:25 -07:00
nishantmonu51
ea8b2dffd5 Add chatHandlerResource 2014-04-09 14:25:18 +05:30
fjy
7db756f819 prepare for next release 2014-04-08 16:25:59 -07:00
fjy
a4df23f092 prepare for next release 2014-04-08 11:42:59 -07:00
nishantmonu51
c6f4b344cb add bindings for chat handler provider 2014-04-08 11:56:23 +05:30
fjy
4ef2bbbfc1 prepare for next release 2014-04-07 14:37:02 -07:00
fjy
2e9579a146 prepare for next release 2014-04-07 12:43:30 -07:00
fjy
1843316db6 commonalize event receiver firehose 2014-04-03 20:46:36 -07:00
fjy
5d8d506fe8 fix commented out filters 2014-04-03 17:06:28 -07:00
fjy
d9062d91fa fix endpoint bugs and more docs 2014-04-03 17:01:33 -07:00
fjy
b0bf08554a fix broken build 2014-04-02 22:22:42 -07:00
fjy
e53d107472 revert broken cache 2014-04-02 22:12:22 -07:00
fjy
ea9f31bbe0 learn to math and prepare for next release 2014-04-02 21:31:17 -07:00
fjy
f185d215e1 fix jetty default thread pool size for jetty 9 and prepare for next release 2014-04-02 21:01:07 -07:00
fjy
fc94b847c3 prepare for next release 2014-04-02 17:31:19 -07:00
fjy
7547e989f0 Merge pull request #456 from metamx/processing-threads-default 
more sensible defaults
 2014-04-02 18:25:43 -06:00
Xavier Léauté
2eb9493010 fix documentation link 2014-04-02 15:27:49 -07:00
fjy
1866cbad1b remove unneeded comment 2014-04-01 18:15:51 -07:00
fjy
eaec0e3ab2 cleanup 2014-04-01 17:56:25 -07:00
fjy
6952eb7878 asynch servlet for query forwarding 2014-04-01 17:51:28 -07:00
nishantmonu51
06b53f02a8 upgrade default version in CluHadoopIndexer and merge from master 2014-03-27 03:37:45 +05:30
fjy
5169249ed5 Merge pull request #429 from metamx/compute-populate-cache 
Enable historical node to populate cache
 2014-03-25 12:03:26 -06:00
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