Commit Graph

448 Commits

Author SHA1 Message Date
xvrl 3687cba18e close resources as we iterate over them 2013-03-22 17:42:10 -07:00
Eric Tschetter 35cfd1f186 [maven-release-plugin] prepare for next development iteration 2013-03-21 13:14:20 -05:00
Eric Tschetter 3860710f11 [maven-release-plugin] prepare release druid-0.3.26 2013-03-21 13:14:14 -05:00
xvrl 16e4cd4291 fix cursor overshooting granularity boundaries in IncrementalIndexStorageAdapter as well 2013-03-21 10:38:39 -07:00
xvrl c0397aa67c add test case for granularities not aligned with segment boundaries 2013-03-21 10:38:06 -07:00
xvrl d722c99530 fix cursor overshooting granularity boundaries, due to incorrect gran.next() usage 2013-03-20 23:36:52 -07:00
xvrl 57f8810721 properly close rowiterators 2013-03-20 14:07:06 -07:00
xvrl 0b04114c12 more squigglies 2013-03-20 12:17:20 -07:00
xvrl 8eec41f934 squigglies ftw 2013-03-20 11:42:17 -07:00
Eric Tschetter cc08d6029f 1) getDimensionCardinality() on QueryIndexStorageAdapter wasn't case insensitive. 2013-03-20 12:03:07 -05:00
xvrl c68bd66945 add close method to aggregators 2013-03-19 16:03:48 -07:00
Eric Tschetter f47319f118 [maven-release-plugin] prepare for next development iteration 2013-03-18 17:09:01 -05:00
Eric Tschetter 1066144b43 [maven-release-plugin] prepare release druid-0.3.25 2013-03-18 17:08:56 -05:00
Eric Tschetter 71aa8b8077 1) It's great when log lines don't generate exceptions 2013-03-18 17:06:51 -05:00
Eric Tschetter 57f52f71fc 1) Try checking for parent dirs first and creating if they aren't there when moving files from the legacy directory to the new one. 2013-03-18 17:04:11 -05:00
Eric Tschetter cba404a65d [maven-release-plugin] prepare for next development iteration 2013-03-18 13:02:40 -05:00
Eric Tschetter 29a0a7e6c6 [maven-release-plugin] prepare release druid-0.3.24 2013-03-18 13:02:33 -05:00
Fangjin Yang b9de751b32 [maven-release-plugin] prepare for next development iteration 2013-03-15 14:32:31 -07:00
Fangjin Yang 57655f19c4 [maven-release-plugin] prepare release druid-0.3.23 2013-03-15 14:32:24 -07:00
Fangjin Yang d316dfc8e1 Merge branch 'master' of github.com:metamx/druid 2013-03-15 14:29:19 -07:00
Fangjin Yang 6f771796b6 fix js bugs with indexer console 2013-03-15 14:28:55 -07:00
Eric Tschetter 7dacf952d6 [maven-release-plugin] prepare for next development iteration 2013-03-15 13:53:39 -05:00
Eric Tschetter ff017fe72a [maven-release-plugin] prepare release druid-0.3.22 2013-03-15 13:53:33 -05:00
Eric Tschetter a933438e4e 1) Fix bugs with VersionConverterTask
2) Fix bugs with NPEs on indexing
2013-03-15 13:48:55 -05:00
Gian Merlino f6752799bc Merge branch 'master' into realtime-index-task
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/actions/SegmentInsertAction.java
2013-03-14 13:45:59 -07:00
cheddar 2a94bd508d Merge pull request #104 from metamx/javascript-dimfilters
support for Javascript DimFilters
2013-03-14 11:47:55 -07:00
Gian Merlino df8e4d4061 Merge branch 'master' into realtime-index-task 2013-03-13 22:43:01 -07:00
Eric Tschetter 4c165b4880 1) Better logging of master doing version checking
2) Exception out when the scv cannot find its indexer
2013-03-13 19:15:29 -05:00
Eric Tschetter 2bd34f1454 [maven-release-plugin] prepare for next development iteration 2013-03-13 18:32:00 -05:00
Eric Tschetter b7960e202d [maven-release-plugin] prepare release druid-0.3.21 2013-03-13 18:31:55 -05:00
Eric Tschetter f1175389c4 [maven-release-plugin] prepare for next development iteration 2013-03-13 16:33:17 -05:00
Eric Tschetter 8aac482618 [maven-release-plugin] prepare release druid-0.3.20 2013-03-13 16:33:10 -05:00
Fangjin Yang a49d0c5e4c [maven-release-plugin] prepare for next development iteration 2013-03-11 17:20:16 -07:00
Fangjin Yang 97f828f6b1 [maven-release-plugin] prepare release druid-0.3.19 2013-03-11 17:20:09 -07:00
Gian Merlino f8d9a3b19b IndexGranularity: Fix increment for day, week 2013-03-11 11:08:44 -07:00
Eric Tschetter d1161ae0ec 1) Master should create the config table if it's not there. 2013-03-08 12:41:46 -06:00
Nelson Ray 7a57609c5b emit metrics corresponding to cost-based balancing 2013-03-07 16:31:57 -08:00
Nelson Ray 9f405c0b1e fix constant segment balancing and separate out the differences between segment assignment and balancing 2013-03-07 16:31:57 -08:00
Eric Tschetter 1c3ef48f34 1) Adjust the Config stuff that WorkerSetupManager was using to be reusable
2) Use new ConfigManager to pull out a whitelist for the Master
2013-03-07 17:45:57 -06:00
Eric Tschetter 6864007c05 1) Remove Task parameter from other methods off of TaskToolbox that required it
2) Move getTaskDir() off of TaskConfig and onto TaskToolbox
3) Rename SegmentKiller interface to DataSegmentKiller
4) Change signature of "DataSegmentKiller.kill(Collection<DataSegment>) throws ServiceException" to just kill(DataSegment) throws SegmentLoadingException
5) Add various log messages
6) Update the version of the segment that has been converted
2013-03-07 17:44:06 -06:00
Eric Tschetter c9b411c0ca 1) Remove the need for TaskActions to require a Task as a constructor parameter 2013-03-07 17:44:05 -06:00
Eric Tschetter fd0fcc7319 Whitespace! 2013-03-07 16:18:31 -06:00
Eric Tschetter 82aa6ed7dd 1) Adjust the SingleSegmentLoader to be able to use cache locations from previous versions as well without re-downloading 2013-03-07 15:55:23 -06:00
Fangjin Yang 9d9efadf72 working indexer console 2013-03-06 10:38:40 -08:00
xvrl 4cb3ca00bc support for javascript dimfilters 2013-03-06 09:59:53 -08:00
Fangjin Yang 552b365194 [maven-release-plugin] prepare for next development iteration 2013-03-04 15:11:37 -08:00
Fangjin Yang fdb3911794 [maven-release-plugin] prepare release druid-0.3.18 2013-03-04 15:11:28 -08:00
Fangjin Yang 91f54a72ee fix broken UT 2013-03-04 15:09:55 -08:00
Fangjin Yang 6977fe03bd [maven-release-plugin] prepare for next development iteration 2013-03-04 13:08:26 -08:00
Fangjin Yang d4f4e41320 [maven-release-plugin] prepare release druid-0.3.16 2013-03-04 13:08:09 -08:00
Fangjin Yang 92ab51e70c fix bugs in balancing logic and removing auto-scaled node 2013-03-04 13:03:15 -08:00
Fangjin Yang ee38d096c7 [maven-release-plugin] prepare for next development iteration 2013-03-02 09:29:04 -08:00
Fangjin Yang a90d204ba2 [maven-release-plugin] prepare release druid-0.3.15 2013-03-02 09:28:51 -08:00
Fangjin Yang 879b2475d4 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:53:13 -08:00
Fangjin Yang e3ba6efb80 [maven-release-plugin] prepare release druid-0.3.14 2013-03-01 19:53:07 -08:00
Fangjin Yang 7f6747194d [maven-release-plugin] prepare for next development iteration 2013-03-01 19:45:59 -08:00
Fangjin Yang 06a2a3a793 [maven-release-plugin] prepare release druid-0.3.13 2013-03-01 19:45:50 -08:00
Fangjin Yang e0700bb161 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:28:34 -08:00
Fangjin Yang 38c8ffb552 [maven-release-plugin] prepare release druid-0.3.12 2013-03-01 19:28:28 -08:00
Fangjin Yang 49e61d00fd [maven-release-plugin] prepare for next development iteration 2013-03-01 19:05:46 -08:00
Fangjin Yang 7e316e3508 [maven-release-plugin] prepare release druid-0.3.11 2013-03-01 19:05:39 -08:00
Fangjin Yang e2b4163e31 [maven-release-plugin] prepare for next development iteration 2013-03-01 18:24:09 -08:00
Fangjin Yang 023199702e [maven-release-plugin] prepare release druid-0.3.10 2013-03-01 18:24:03 -08:00
Fangjin Yang a574da55ed fix broken UT 2013-03-01 18:22:30 -08:00
Gian Merlino 0092ad7efb [maven-release-plugin] prepare for next development iteration 2013-03-01 16:57:47 -08:00
Gian Merlino 03ff72b7e2 [maven-release-plugin] prepare release druid-0.3.8 2013-03-01 16:57:38 -08:00
Gian Merlino 998ed0a8de [maven-release-plugin] prepare for next development iteration 2013-03-01 14:43:20 -08:00
Gian Merlino 89d5ddf2f7 [maven-release-plugin] prepare release druid-0.3.7 2013-03-01 14:43:13 -08:00
Fangjin Yang 360c6a1df1 [maven-release-plugin] prepare for next development iteration 2013-03-01 13:55:07 -08:00
Fangjin Yang a43dc44ebb [maven-release-plugin] prepare release druid-0.3.6 2013-03-01 13:55:01 -08:00
Fangjin Yang 3264a689f1 [maven-release-plugin] prepare for next development iteration 2013-03-01 11:43:23 -08:00
Fangjin Yang 334fffdef5 [maven-release-plugin] prepare release druid-0.3.5 2013-03-01 11:43:16 -08:00
Gian Merlino f862d9205d Merge branch 'master' into hadoop-index-task
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
2013-02-27 06:53:06 -08:00
Nelson Ray d1634fe5ef fix cost balancing so assignment/balancing doesn't get stuck 2013-02-26 18:58:16 -08:00
Fangjin Yang 2e1e1753d5 [maven-release-plugin] prepare for next development iteration 2013-02-26 15:15:54 -08:00
Fangjin Yang ab456cf3b1 [maven-release-plugin] prepare release druid-0.3.4 2013-02-26 15:15:36 -08:00
Nelson Ray e67a8757ba Merge remote-tracking branch 'origin/master' into new_balancer
Conflicts:
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-26 14:18:07 -08:00
Gian Merlino d32a6284ce Merge branch 'task-stuff' into indexing_refactor
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/worker/config/WorkerConfig.java
2013-02-26 13:03:56 -08:00
Gian Merlino 3129e5451b Merge branch 'master' into task-stuff 2013-02-25 12:33:45 -08:00
Gian Merlino 9964e7dfe4 [maven-release-plugin] prepare for next development iteration 2013-02-25 12:24:24 -08:00
Gian Merlino 99c4f9446c [maven-release-plugin] prepare release druid-0.3.3 2013-02-25 12:24:15 -08:00
Gian Merlino 49700dffe9 Merge branch 'master' into task-stuff
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
2013-02-25 12:18:31 -08:00
Eric Tschetter e0f6df1a5c [maven-release-plugin] prepare for next development iteration 2013-02-21 20:39:50 -06:00
Eric Tschetter 846bc0e4f0 [maven-release-plugin] prepare release druid-0.3.2 2013-02-21 20:39:45 -06:00
Eric Tschetter 699aadd2b1 [maven-release-plugin] prepare for next development iteration 2013-02-21 15:50:01 -06:00
Eric Tschetter 606a2e4b01 [maven-release-plugin] prepare release druid-0.3.1 2013-02-21 15:49:55 -06:00
Eric Tschetter f8c54a72c2 1) Changes to allow for local storage 2013-02-21 15:47:01 -06:00
Eric Tschetter dc3459d3f9 1) Initial commit of refactorings on top of housejester's to simplify the zipping and simplify the creation of other methods of loading data 2013-02-21 15:47:01 -06:00
James Estes d1626576c0 Working toward making it easier to add new SegmentPullers.
1) Move the local cacheFile logic out of the S3 pullers into the SingleSegmentLoader
2) Make the S3SegmentPuller just pull down the file
3) Make the Loader do the unzip, ungzip, or rename
4) 2 and 3 make S3ZippedSegmentPuller not necessary (still there, just deprecated and empty)
4) Tweak the TaskToolbox so that the Pullers returned by getSegmentGetters behave the same as they did before
2013-02-21 15:47:01 -06:00
Deep Ganguli 60da9ffddb Merge branch 'master' into hadoop-index-task
Conflicts:
	common/src/main/java/com/metamx/druid/utils/JodaUtils.java
	indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java
	indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java
	indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java
2013-02-15 13:22:31 -08:00
Gian Merlino 824e3c0eb2 [maven-release-plugin] prepare for next development iteration 2013-02-15 13:03:39 -08:00
Gian Merlino 6bbc992101 [maven-release-plugin] prepare release druid-0.3.0 2013-02-15 13:03:32 -08:00
Nelson Ray 728e208f49 merge master 2013-02-15 11:39:22 -08:00
xvrl 05d347c304 Merge remote-tracking branch 'origin/master' into speedup-timeboundary
Conflicts:
	client/pom.xml
	common/pom.xml
	druid-services/pom.xml
	examples/pom.xml
	examples/rand/pom.xml
	examples/twitter/pom.xml
	index-common/pom.xml
	indexer/pom.xml
	merger/pom.xml
	pom.xml
	realtime/pom.xml
	server/pom.xml
2013-02-15 11:25:47 -08:00
Eric Tschetter 5ee7c0c264 1) Remove stray import of java.util.List 2013-02-15 12:15:53 -06:00
Gian Merlino 548c901c0b Additional fix for columns with cardinality 0 2013-02-14 23:45:02 -08:00
Gian Merlino 3fed8ee0ce [maven-release-plugin] prepare for next development iteration 2013-02-14 21:23:46 -08:00
Gian Merlino ba7df5b709 [maven-release-plugin] prepare release druid-0.2.9 2013-02-14 21:23:41 -08:00
Gian Merlino 22d1f2a0c0 IndexMergerTest: Empty column test 2013-02-14 21:11:31 -08:00
Gian Merlino 152bf201ec [maven-release-plugin] prepare for next development iteration 2013-02-14 16:27:20 -08:00
Gian Merlino e56bc27f93 [maven-release-plugin] prepare release druid-0.2.8 2013-02-14 16:27:12 -08:00
Eric Tschetter 4f11eb5209 1) Fix alert sent from line DruidMasterBalancer:71 to not include all of the segments that a server is holding 2013-02-14 18:24:51 -06:00
Fangjin Yang bf0d9c601d Merge branch 'task-stuff' into indexing_refactor
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/KillTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunnerWorkQueue.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
2013-02-14 15:42:07 -08:00
Gian Merlino 18daa19fc9 Merge branch 'master' into task-stuff
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java
	merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/TaskQueueTest.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-14 13:10:29 -08:00
Nelson Ray a616f86128 add DateTime import back 2013-02-14 09:09:22 -08:00
Nelson Ray 754b065c54 merge master 2013-02-14 09:08:25 -08:00
Eric Tschetter c5b78e75cf 1) Move up to Jackson 2.1
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
2013-02-13 18:51:32 -08:00
Fangjin Yang 82f02a4fe4 Merge branch 'master' into indexing_refactor
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
2013-02-13 16:34:14 -08:00
Fangjin Yang c7b4973700 bug fixes for RTR 2013-02-13 14:19:11 -08:00
Nelson Ray 429e23d3b2 change break to continue in BalancerCostAnalyzer to skip calculating cost when it's not necessary 2013-02-13 08:57:39 -08:00
Eric Tschetter a0b159fed7 1) Move up to Jackson 2.1
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
2013-02-12 20:58:17 -06:00
Nelson Ray fcbac96193 revert change to findNewSegmentHome: now return single ServerHolder 2013-02-12 10:47:30 -08:00
xvrl 07b0b4611b bump up to 0.3.0 2013-02-12 09:52:21 -08:00
Fangjin Yang b27a459f71 more refactoring and UT passing at this point 2013-02-11 18:13:01 -08:00
xvrl e9f546c4ca add default implementations to QueryToolChest methods 2013-02-11 16:51:40 -08:00
Nelson Ray 695b78b19c make findNewSegmentHome return a priority queue so assignment can assign replicants to other servers 2013-02-11 15:28:17 -08:00
xvrl e10025c841 filter out unneeded segments for TimeBoundary query 2013-02-11 13:21:37 -08:00
Fangjin Yang 69d0d98df6 t Merge branch 'master' into indexing_refactor 2013-02-11 12:37:20 -08:00
Fangjin Yang a9176e738a Merge branch 'master' into indexing_refactor 2013-02-11 12:36:49 -08:00
Nelson Ray 1b9764fffb add binary version to datasegments for balancer test 2013-02-11 11:36:45 -08:00
Nelson Ray e12da51057 merge master 2013-02-11 11:28:50 -08:00
cheddar 05168808c2 Merge pull request #77 from metacret/master
Adding LinearShardSpec and ACL on S3 object
2013-02-11 11:12:31 -08:00
Fangjin Yang e519f82e87 [maven-release-plugin] prepare for next development iteration 2013-02-11 10:58:51 -08:00
Fangjin Yang 73f7468a23 [maven-release-plugin] prepare release druid-0.2.7 2013-02-11 10:58:43 -08:00
Fangjin Yang 07c005a0f7 Merge branch 'master' of github.com:metamx/druid 2013-02-11 10:56:39 -08:00
Fangjin Yang ac93f752b0 fix a case where a segment may get stuck in the terminate queue 2013-02-11 10:56:30 -08:00
Fangjin Yang 111df9a90e Merge branch 'master' into indexing_refactor
Conflicts:
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-07 10:35:32 -08:00
xvrl 6ff42f379c fix cut-n-paste mistake in error message 2013-02-07 10:11:36 -08:00
Fangjin Yang ec2b906fad [maven-release-plugin] prepare for next development iteration 2013-02-06 18:43:42 -08:00
Fangjin Yang 22d9607169 [maven-release-plugin] prepare release druid-0.2.6 2013-02-06 18:43:34 -08:00
Fangjin Yang 267c797023 fix bug in throttle replicants 2013-02-06 18:40:29 -08:00
Fangjin Yang e09c658352 [maven-release-plugin] prepare for next development iteration 2013-02-06 17:42:39 -08:00
Fangjin Yang 668353e895 [maven-release-plugin] prepare release druid-0.2.5 2013-02-06 17:42:33 -08:00
Fangjin Yang 0d303bee96 reset lifetimes for the replication throttle 2013-02-06 17:41:08 -08:00
Fangjin Yang d023d219ae [maven-release-plugin] prepare for next development iteration 2013-02-06 16:54:21 -08:00
Fangjin Yang d0fdf4ccf0 [maven-release-plugin] prepare release druid-0.2.4 2013-02-06 16:54:16 -08:00
Fangjin Yang 7540dd58ca fix broken UT 2013-02-06 16:52:24 -08:00
fjy e2862fe1fb Merge pull request #79 from metamx/bug_fixes
Throttle replicants that are created by rules
2013-02-06 16:50:04 -08:00
Fangjin Yang 84baef0462 fix some bugs from last commit 2013-02-06 13:57:56 -08:00
Fangjin Yang 97999c06c4 throttle replicants 2013-02-06 11:08:44 -08:00
Jae Hyeon Bae 4f70bbc687 adding linear shard spec and ACL for s3 bucket 2013-02-04 10:27:09 -08:00
Eric Tschetter 34b4383934 1) Adjust DataSegment to have a binaryVersion field that indicates the expected binary version of the segment files
2) Eliminate race condition from RemoteTaskRunnerTest.testAlreadyExecutedTask()
2013-02-01 18:59:33 -06:00
Eric Tschetter c63eb2b77b Merge branch 'master' of github.com:metamx/druid 2013-02-01 18:39:09 -06:00
xvrl 7ec3563e7b [maven-release-plugin] prepare for next development iteration 2013-02-01 16:25:42 -08:00
xvrl a239f62158 [maven-release-plugin] prepare release druid-0.2.3 2013-02-01 16:25:35 -08:00
Eric Tschetter 1a9edbebd3 1) whitespace 2013-02-01 16:21:26 -06:00
Eric Tschetter 5f2c3cec1b Merge branch 'master' of github.com:metamx/druid 2013-02-01 16:19:26 -06:00
Eric Tschetter 7de5c7806e 1) Some whitespace changes
2) Fix up the alerting to actually include the segment and server for when the MasterBalancer has something stuck in the queue
2013-02-01 16:19:17 -06:00
Fangjin Yang 9e88197845 change endpoints for killing segments 2013-02-01 14:08:52 -08:00
Nelson Ray 1c9270add3 change format of line comment 2013-02-01 11:25:41 -08:00