Commit Graph

455 Commits

Author SHA1 Message Date
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 57e022f446 [maven-release-plugin] prepare for next development iteration 2014-01-17 15:53:54 -08:00
fjy 6540b2a58e [maven-release-plugin] prepare release druid-0.6.52 2014-01-17 15:53:50 -08:00
fjy f898c29e20 fix batch indexing and prepare for next release 2014-01-17 15:52:04 -08:00
fjy 26a0f862fb [maven-release-plugin] prepare for next development iteration 2014-01-14 17:35:45 -08:00
fjy 3737ac4966 [maven-release-plugin] prepare release druid-0.6.51 2014-01-14 17:35:40 -08:00
fjy 0ceda034cd fix dependency issue and prepare for next release 2014-01-14 17:34:02 -08:00
fjy 528efedf52 [maven-release-plugin] prepare for next development iteration 2014-01-14 16:08:47 -08:00
fjy b4e4a5df96 [maven-release-plugin] prepare release druid-0.6.50 2014-01-14 16:08:43 -08:00
fjy 187bb84b45 prepare for next release 2014-01-14 16:07:05 -08:00
fjy 4a9c255cde [maven-release-plugin] prepare for next development iteration 2014-01-14 09:56:34 -08:00
fjy d8ac5575bc [maven-release-plugin] prepare release druid-0.6.49 2014-01-14 09:56:30 -08:00
fjy 9184906c39 prepare for next release 2014-01-14 09:54:42 -08:00
fjy 396311a547 [maven-release-plugin] prepare for next development iteration 2014-01-13 18:04:29 -08:00
fjy 9c9d6287a2 [maven-release-plugin] prepare release druid-0.6.48 2014-01-13 18:04:24 -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
fjy 2b46c1d292 [maven-release-plugin] prepare for next development iteration 2014-01-02 19:53:41 -08:00
fjy 7a0f634b02 [maven-release-plugin] prepare release druid-0.6.47 2014-01-02 19:53:35 -08:00
Xavier Léauté 95d92915bf more tests for Initialization + dependency cleanup 2013-12-30 16:31:10 -08:00
Gian Merlino 668cf009a0 [maven-release-plugin] prepare for next development iteration 2013-12-20 12:28:54 -08:00
Gian Merlino bd58def933 [maven-release-plugin] prepare release druid-0.6.46 2013-12-20 12:28:49 -08:00
Gian Merlino bbe1b82347 Update versions 2013-12-20 12:26:27 -08:00
Gian Merlino 9043c211b2 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:25:36 -08:00
Gian Merlino 29c0fa1df9 [maven-release-plugin] prepare release druid-0.6.45 2013-12-20 11:25:31 -08:00
Gian Merlino 4bc8ff4d6a Update versions 2013-12-20 11:19:36 -08:00
Gian Merlino 5711ac4aff [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 3b15f6a834 [maven-release-plugin] prepare release druid-0.6.44 2013-12-20 11:17:01 -08:00
Gian Merlino c503f5e9c5 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 97095ee3db [maven-release-plugin] prepare release druid-0.6.43 2013-12-20 11:17:00 -08:00
fjy fba6caf7fd Merge pull request #326 from metamx/versions
StatusResource
2013-12-18 22:44:50 -08:00
Gian Merlino 25c3f28907 [maven-release-plugin] prepare for next development iteration 2013-12-18 18:38:27 -08:00
Gian Merlino 6a740768d6 [maven-release-plugin] prepare release druid-0.6.42 2013-12-18 18:38:22 -08:00
Gian Merlino 8d8ec51c9c [maven-release-plugin] prepare for next development iteration 2013-12-18 16:05:33 -08:00
Gian Merlino 00d651bf6f [maven-release-plugin] prepare release druid-0.6.41 2013-12-18 16:05:27 -08:00
Gian Merlino d0fd58bbae [maven-release-plugin] prepare for next development iteration 2013-12-18 15:35:55 -08:00
Gian Merlino 231d7a6d1f [maven-release-plugin] prepare release druid-0.6.40 2013-12-18 15:35:50 -08:00
Gian Merlino fc4dd51194 Update versions 2013-12-18 15:33:25 -08:00
Hagen Rother fd427a3328 bump the maven shader plugin and config 2013-12-18 17:30:12 +01:00
fjy 494ec53050 [maven-release-plugin] prepare for next development iteration 2013-12-17 17:48:46 -08:00
fjy 2a98a4d3e0 [maven-release-plugin] prepare release druid-0.6.39 2013-12-17 17:48:42 -08:00
fjy d112b2d211 prepare for next release 2013-12-17 17:47:04 -08:00
fjy 0051877f84 fix status endpoint 2013-12-17 17:46:16 -08:00