Commit Graph

804 Commits

Author SHA1 Message Date
Stefán Freyr Stefánsson b3530fb15d Adding a configuration property to disable setting an ACL on the segment pushed to S3. 2013-07-24 23:37:21 +00:00
Dhruv Parthasarathy a03dcc6429 cleaned up comments 2013-07-24 15:34:08 -07:00
Dhruv Parthasarathy bcb3e089d8 profiler added, commented out initialTotalCost normalization and normalizedInitialCost 2013-07-24 14:57:02 -07:00
fjy cfc635de53 [maven-release-plugin] prepare for next development iteration 2013-07-24 09:41:30 -07:00
fjy 09576ccd09 [maven-release-plugin] prepare release druid-0.5.19 2013-07-24 09:41:20 -07:00
Dhruv Parthasarathy 6dc8d09b00 partial changes 2013-07-23 17:25:36 -07:00
fjy 980b09d903 fix broken test 2013-07-23 10:19:26 -07:00
fjy ea7c7d1d66 Merge branch 'master' into batch-zk
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
2013-07-23 10:14:26 -07:00
fjy ef27810458 rename to fix case issue 2013-07-22 18:02:10 -07:00
fjy 3f97ac9253 add read to batch zk 2013-07-22 18:01:13 -07:00
cheddar 7504f3ab65 1) Adjust the Announcer to cleanup parent nodes that it creates. This stops it from leaving little turdlings lying around on zookeeper as nodes exit
2) Rename *CuratorDataSegmentAnnouncer because neither of them depend directly on Curator.
2013-07-22 16:31:01 -07:00
Jan Rudert 527c6c81c5 refactored StringInputRowParser to handle a ByteBuffer, better wiring and configuration of KafkaFirehose 2013-07-19 14:12:53 +02:00
fjy 1b56fa5416 [maven-release-plugin] prepare for next development iteration 2013-07-18 15:37:54 -07:00
fjy 0c11602623 [maven-release-plugin] prepare release druid-0.5.18 2013-07-18 15:37:16 -07:00
fjy 816f673a47 [maven-release-plugin] prepare for next development iteration 2013-07-18 15:14:47 -07:00
fjy bcb1b99410 [maven-release-plugin] prepare release druid-0.5.17 2013-07-18 15:14:32 -07:00
fjy 357d77aca2 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:53:56 -07:00
fjy b5b6cd6594 [maven-release-plugin] prepare release druid-0.5.16 2013-07-18 14:53:46 -07:00
fjy 08f56feee3 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:48:53 -07:00
fjy 74b4c577f0 [maven-release-plugin] prepare release druid-0.5.15 2013-07-18 14:48:42 -07:00
fjy 5b55db6a42 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:28:54 -07:00
fjy 3792a54869 [maven-release-plugin] prepare release druid-0.5.14 2013-07-18 14:28:46 -07:00
fjy 2f63140f2f [maven-release-plugin] prepare for next development iteration 2013-07-18 14:17:16 -07:00
fjy 4481b10efc [maven-release-plugin] prepare release druid-0.5.13 2013-07-18 14:16:55 -07:00
fjy df88274d9e fix poms 2013-07-18 14:14:16 -07:00
fjy 325a5fb4c0 [maven-release-plugin] prepare release druid-0.5.12 2013-07-18 14:09:56 -07:00
fjy 4e2f6380e6 Merge branch 'master' of github.com:metamx/druid 2013-07-18 13:25:08 -07:00
fjy 7d58a2d8db fix bug with enabling segments and improve replication logic 2013-07-18 13:24:52 -07:00
Jan Rudert d3412c851b Merge branch 'master' of github.com:metamx/druid into kafka-protobuf 2013-07-18 15:14:02 +02:00
cheddar e906481704 Merge pull request #191 from metamx/s3-puller-retries
S3 puller retries
2013-07-17 17:07:57 -07:00
fjy cef0e50881 [maven-release-plugin] prepare for next development iteration 2013-07-17 09:14:37 -07:00
fjy 22526a6c68 [maven-release-plugin] prepare release druid-0.5.11 2013-07-17 09:14:28 -07:00
fjy 43bdb99593 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:55:42 -07:00
fjy d5fee45bf4 [maven-release-plugin] prepare release druid-0.5.10 2013-07-16 17:55:29 -07:00
fjy f3187b67a5 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:32:05 -07:00
fjy eb89857bdc [maven-release-plugin] prepare release druid-0.5.9 2013-07-16 17:31:55 -07:00
fjy 0f492e17c3 [maven-release-plugin] prepare for next development iteration 2013-07-16 16:53:51 -07:00
fjy a3879d1151 [maven-release-plugin] prepare release druid-0.5.8 2013-07-16 16:53:41 -07:00
fjy 4e84fb5f03 better logic for exiting load rule assign if replicants cannot be created 2013-07-16 16:50:52 -07:00
fjy f422bfae8c [maven-release-plugin] prepare for next development iteration 2013-07-16 13:35:38 -07:00
fjy cd174dbd80 [maven-release-plugin] prepare release druid-0.5.7 2013-07-16 13:35:29 -07:00
fjy afac15d631 fix version problem 2013-07-16 13:32:50 -07:00
fjy 36756aa557 [maven-release-plugin] prepare release druid-0.5.6 2013-07-16 13:30:16 -07:00
fjy 49a80572b7 fix master speed issue with immutable copy of in druid server, better exception handling in moving and dropping segments 2013-07-16 13:24:43 -07:00
Gian Merlino 6258d77398 Retry s3 operations on non-wrapped IOExceptions
Can happen if we get a socket related mishap while fetching an s3 object.
2013-07-16 08:25:23 -07:00
Gian Merlino 320f1fe840 Move retryS3Operation to S3Utils 2013-07-16 08:07:14 -07:00
Gian Merlino 945bc9a370 Limited retries on s3 segment puller exceptions
Useful for reducing spurious alerts due to general s3 flakiness.
2013-07-16 08:03:47 -07:00
Jan Rudert 0961d8f149 Merge branch 'master' of github.com:metamx/druid 2013-07-11 16:02:11 +02:00
fjy cc35841e23 Merge branch 'batch-zk' into worker-resource 2013-07-08 11:04:05 -07:00
fjy 454f23d7c0 Merge branch 'master' of github.com:metamx/druid into batch-zk 2013-07-08 10:40:30 -07:00
Jan Rudert d5b4417280 Merge branch 'master' of github.com:metamx/druid 2013-07-08 11:50:15 +02:00
Jan Rudert 18ec081855 moved getHdfsStorageDir() to DataSegmentPusherUtil, extended test 2013-07-08 08:39:08 +02:00
cheddar b42c5743c9 Merge pull request #177 from nebrera/master
Postgresql adaptation
2013-07-05 16:42:57 -07:00
Jan Rudert 6f06d701d9 Building a correct segment path for HDFS 2013-07-04 16:00:20 +02:00
fjy be2f153985 Merge branch 'bug-fix' into worker-resource 2013-07-02 16:25:07 -07:00
fjy d3eb491155 Merge branch 'batch-zk' into worker-resource
Conflicts:
	pom.xml
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
2013-07-02 16:24:59 -07:00
fjy e21aa41bdd Merge branch 'master' into worker-resource
Conflicts:
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
2013-07-02 16:23:53 -07:00
fjy fde874ea56 fix according to code review 2013-07-02 16:11:12 -07:00
fjy 9818d28a26 Merge branch 'master' into bug-fix 2013-07-02 15:59:52 -07:00
fjy 5ac2d1db0b Merge branch 'master' of github.com:metamx/druid into batch-zk
Conflicts:
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
2013-07-02 15:57:31 -07:00
fjy 7219ed15d3 fix according to code review 2013-07-02 15:56:12 -07:00
cheddar fd1d73e83a [maven-release-plugin] prepare for next development iteration 2013-07-01 16:04:31 -07:00
cheddar 090921b43e [maven-release-plugin] prepare release druid-0.5.5 2013-07-01 16:04:25 -07:00
cheddar 797a083b69 1) Adjust SingleSegmentLoader to allow for storing segments on multiple different mount points. The specification language is really janky right now, so this is remaining a stealth feature for the time being. 2013-07-01 14:56:57 -07:00
cheddar e8afeda046 Merge branch 'master' of github.com:metamx/druid 2013-07-01 14:54:32 -07:00
fjy 5a57539736 fix hdfs config 2013-06-28 10:18:10 -07:00
Pablo Nebrera e9ce6b596c PostgresSQL integration with druid 2013-06-28 12:49:24 +02:00
fjy 2969d9a713 Merge branch 'master' into batch-zk
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
2013-06-27 16:46:37 -07:00
fjy a6787ab201 fix up configs 2013-06-27 16:40:17 -07:00
fjy d5306c5dd9 Merge branch 'master' into worker-resource
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
2013-06-27 12:52:58 -07:00
fjy cce62cbd8b The highly important commit of changing a log line 2013-06-26 17:27:04 -07:00
fjy 15a4dae2b1 bunch of issue fixes 2013-06-26 10:45:54 -07:00
cheddar cd0fa34a73 1) Log exception when there is an error removing a segment 2013-06-25 11:18:04 -07:00
fjy caa68e101a first commit; things working right now 2013-06-19 15:56:45 -07:00
fjy b96d6b3546 [maven-release-plugin] prepare for next development iteration 2013-06-10 14:11:19 -07:00
fjy c465d4ef8c [maven-release-plugin] prepare release druid-0.5.4 2013-06-10 14:11:09 -07:00
fjy 3312d9b802 fix merging problem with linear shard specs 2013-06-10 14:07:36 -07:00
fjy 12e78955db [maven-release-plugin] prepare for next development iteration 2013-06-07 14:17:39 -07:00
fjy 962db29e70 [maven-release-plugin] prepare release druid-0.5.3 2013-06-07 14:17:32 -07:00
cheddar 06f90bc2e1 Merge branch 'master' of github.com:metamx/druid 2013-06-07 14:15:39 -07:00
cheddar a949f1672d 1) Fix bug with Master stopping trying to be Master after he losses it once 2013-06-07 14:14:58 -07:00
fjy 37a3994003 add delegating executor service and fix bug with query priortization 2013-06-07 14:08:51 -07:00
Gian Merlino 67be515db6 [maven-release-plugin] prepare for next development iteration 2013-06-06 18:25:07 -07:00
Gian Merlino 8dbb69c8a8 [maven-release-plugin] prepare release druid-0.5.2 2013-06-06 18:24:59 -07:00
fjy ee38ca5463 [maven-release-plugin] prepare for next development iteration 2013-06-06 18:00:31 -07:00
fjy a36d0007ac [maven-release-plugin] prepare release druid-0.5.1 2013-06-06 18:00:24 -07:00
fjy d5b7e644b6 [maven-release-plugin] prepare for next development iteration 2013-06-06 16:10:45 -07:00
fjy 2113715f5d [maven-release-plugin] prepare release druid-0.5.0 2013-06-06 16:10:39 -07:00
fjy f1dea971f2 Merge pull request #156 from metamx/query-prioritization
Query prioritization
2013-06-06 16:05:47 -07:00
fjy 19c5dacf3a more code review fixes 2013-06-06 15:57:18 -07:00
fjy e20f547261 fix according to code review 2013-06-06 15:37:19 -07:00
cheddar b8feb98616 1) Make Master honor the druid.monitoring.monitorSystem property to turn off Sigar 2013-06-06 14:55:23 -07:00
fjy d48b4d8d97 Merge branch 'master' into query-prioritization 2013-06-06 14:19:50 -07:00
fjy 8202bc70eb optimize spatial and update poms everywhere 2013-06-05 15:26:40 -07:00
fjy 61074daa67 fix merge error 2013-06-04 18:56:20 -07:00
fjy 63b379ae90 Merge branch 'master' into refactor-indexing 2013-06-04 17:25:16 -07:00
fjy 06931ee0f5 introduce availability groups 2013-06-04 17:12:19 -07:00
cheddar 1a02637bea 1) add full parameter to master endpoint /info/rules/dataSourceName that returns the fully resolved rules, not just the specified rules 2013-06-04 17:10:25 -07:00
cheddar 85ac8d43b6 Merge pull request #153 from metamx/gzip-compression
HTTP gzip compression support
2013-06-04 15:45:51 -07:00
fjy 42cc87a294 Merge branch 'master' into refactor-indexing
Conflicts:
	indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexTask.java
	pom.xml
2013-05-31 17:28:59 -07:00
fjy 93e7ea3787 [maven-release-plugin] prepare for next development iteration 2013-05-31 15:53:23 -07:00
fjy 3d28fcd5e0 [maven-release-plugin] prepare release druid-0.4.32 2013-05-31 15:53:17 -07:00
fjy c02113879d [maven-release-plugin] prepare for next development iteration 2013-05-31 14:00:45 -07:00
fjy 5a3f69ae78 [maven-release-plugin] prepare release druid-0.4.31 2013-05-31 14:00:39 -07:00
fjy 71feb0afeb Merge branch 'master' into query-prioritization 2013-05-30 10:23:28 -07:00
fjy 09f7b181d4 first commit, working UT 2013-05-29 17:04:25 -07:00
fjy 9cb9f4753d [maven-release-plugin] prepare for next development iteration 2013-05-29 09:50:10 -07:00
fjy dd9ac03809 [maven-release-plugin] prepare release druid-0.4.30 2013-05-29 09:50:02 -07:00
fjy 73a392d94a [maven-release-plugin] prepare for next development iteration 2013-05-28 14:28:49 -07:00
fjy c6eec7eb27 [maven-release-plugin] prepare release druid-0.4.29 2013-05-28 14:28:42 -07:00
fjy 54932e3187 [maven-release-plugin] prepare for next development iteration 2013-05-26 13:43:28 -06:00
fjy 9d105ef4ad [maven-release-plugin] prepare release druid-0.4.28 2013-05-26 13:43:21 -06:00
fjy 69a9e04563 [maven-release-plugin] prepare for next development iteration 2013-05-26 13:33:05 -06:00
fjy 39ae7485fd [maven-release-plugin] prepare release druid-0.4.27 2013-05-26 13:32:57 -06:00
fjy e08770695f [maven-release-plugin] prepare for next development iteration 2013-05-23 11:53:29 -06:00
fjy 4c8d9e9f16 [maven-release-plugin] prepare release druid-0.4.26 2013-05-23 11:53:21 -06:00
fjy b5e30cf701 [maven-release-plugin] prepare for next development iteration 2013-05-23 11:05:24 -06:00
fjy 8cc4202fd5 [maven-release-plugin] prepare release druid-0.4.25 2013-05-23 11:05:18 -06:00
fjy 27d4f46156 [maven-release-plugin] prepare for next development iteration 2013-05-22 23:55:15 -07:00
fjy 07ac16633c [maven-release-plugin] prepare release druid-0.4.24 2013-05-22 23:55:06 -07:00
xvrl 192b24c355 enable gzip compression for HTTP requests 2013-05-22 23:02:37 -07:00
fjy 3299900690 [maven-release-plugin] prepare for next development iteration 2013-05-22 13:36:50 -07:00
fjy 08f1cfb68e [maven-release-plugin] prepare release druid-0.4.23 2013-05-22 13:36:44 -07:00
fjy 1fb8c9db7f fix spatial bugs and more tests 2013-05-22 13:35:12 -07:00
fjy 47f2d3b0aa fix druidsetup properties path bug 2013-05-22 10:25:11 -07:00
fjy 3a9d892b05 [maven-release-plugin] prepare for next development iteration 2013-05-21 21:34:42 -07:00
fjy 7e6350321b [maven-release-plugin] prepare release druid-0.4.22 2013-05-21 21:34:34 -07:00
fjy 39f55a010c additional bug fixes for hadoop based spatial indexing 2013-05-21 21:33:06 -07:00
fjy aa5280028f [maven-release-plugin] prepare for next development iteration 2013-05-21 17:12:23 -07:00
fjy c6436dad78 [maven-release-plugin] prepare release druid-0.4.21 2013-05-21 17:12:16 -07:00
fjy 6e5b893e6d make spatial filters work 2013-05-21 17:10:44 -07:00
fjy 69c7131a7b cleanup interval determination in II 2013-05-20 21:06:32 -07:00
fjy e404442ad4 [maven-release-plugin] prepare for next development iteration 2013-05-20 20:21:03 -07:00
fjy b7604c2332 [maven-release-plugin] prepare release druid-0.4.20 2013-05-20 20:20:55 -07:00
fjy efc92e7ca6 bug fixes for segment metadata queries and spatial indexing 2013-05-20 20:19:18 -07:00
fjy cccd5758de [maven-release-plugin] prepare for next development iteration 2013-05-20 13:46:28 -07:00
fjy a9837cc1dd [maven-release-plugin] prepare release druid-0.4.19 2013-05-20 13:46:18 -07:00
fjy 1b4a543f25 add default cassandra configs 2013-05-20 13:44:33 -07:00
fjy 9376a313fc [maven-release-plugin] prepare for next development iteration 2013-05-20 12:19:58 -07:00
fjy af494be074 [maven-release-plugin] prepare release druid-0.4.18 2013-05-20 12:19:50 -07:00
fjy a792525063 Merge tag 'druid-0.4.12.5'
[maven-release-plugin]  copy for tag druid-0.4.12.5

Conflicts:
	client/pom.xml
	common/pom.xml
	examples/pom.xml
	index-common/pom.xml
	indexer/pom.xml
	merger/pom.xml
	pom.xml
	realtime/pom.xml
	server/pom.xml
	services/pom.xml
2013-05-20 12:14:23 -07:00
fjy ee51a5d1ae [maven-release-plugin] prepare release druid-0.4.12.5 2013-05-20 12:07:54 -07:00
fjy 54c48aac6d fix DruidSetup not working 2013-05-20 12:06:21 -07:00
Gian Merlino e28a896463 [maven-release-plugin] prepare for next development iteration 2013-05-18 17:37:30 -07:00
Gian Merlino 8ba757d8d7 [maven-release-plugin] prepare release druid-0.4.17 2013-05-18 17:37:23 -07:00
fjy d826537672 [maven-release-plugin] prepare for next development iteration 2013-05-18 13:44:54 -07:00
fjy dd11c757ea [maven-release-plugin] prepare release druid-0.4.12.4 2013-05-18 13:44:47 -07:00
fjy 0e2fe69130 [maven-release-plugin] prepare for next development iteration 2013-05-18 13:37:27 -07:00
fjy d197eafe1e [maven-release-plugin] prepare release druid-0.4.12.3 2013-05-18 13:37:18 -07:00
fjy 8af9598157 fix currSize bug and maxTime bugs 2013-05-18 13:21:45 -07:00
Gian Merlino e76fd18a36 [maven-release-plugin] prepare for next development iteration 2013-05-17 12:06:24 -07:00
Gian Merlino 7c687aeb73 [maven-release-plugin] prepare release druid-0.4.12.2 2013-05-17 12:06:16 -07:00
Gian Merlino f80e85517c [maven-release-plugin] prepare for next development iteration 2013-05-17 11:14:16 -07:00
Gian Merlino 5df2e40d4e [maven-release-plugin] prepare release druid-0.4.12.1 2013-05-17 11:14:08 -07:00
fjy b0a58af05d Merge pull request #140 from boneill42/cassandra-segments
Initial implementation of Cassandra Data Segment Pusher and Puller
2013-05-17 09:56:44 -07:00
Brian O'Neill c8ff5ca2fb Using string formatter in log statements.
Clean up of imports on the pusher.
2013-05-17 12:54:03 -04:00
fjy 8b8c59d309 Merge branch 'master' into refactor-indexing 2013-05-16 17:35:50 -07:00
Gian Merlino 612f1fb39b [maven-release-plugin] prepare for next development iteration 2013-05-16 16:31:19 -07:00
Gian Merlino c6a36c6522 [maven-release-plugin] prepare release druid-0.4.16 2013-05-16 16:31:12 -07:00
fjy 08d84001ba Merge branch 'master' into refactor-indexing 2013-05-16 16:03:29 -07:00
fjy c6ad0753f0 bug fixes 2013-05-16 16:02:20 -07:00
Gian Merlino aa29af8b24 [maven-release-plugin] prepare for next development iteration 2013-05-16 14:54:12 -07:00
Gian Merlino 5905b6ea6b [maven-release-plugin] prepare release druid-0.4.15 2013-05-16 14:54:04 -07:00
Brian O'Neill 61c014c49f Cleaned up imports. 2013-05-16 13:33:39 -04:00
Brian O'Neill 23998f3f01 - Added cleanup to the puller.
- Edited the documentation to remove reference to real-time node.
2013-05-16 13:04:46 -04:00
fjy 835187be6f fix poms to pass unit tests 2013-05-15 17:38:59 -07:00
fjy 6213c0b63c Merge branch 'master' into refactor-indexing 2013-05-15 17:14:40 -07:00
fjy 20ae1d8b6b lots of cleanups and refactorings 2013-05-15 15:37:04 -07:00
fjy 803e8ff69e add configurable spatial dimensions to hadoop indexer 2013-05-14 17:38:05 -07:00
fjy 5af188f18d Merge branch 'master' into spatial 2013-05-14 16:10:18 -07:00
cheddar 86415e70ea Merge pull request #142 from metamx/improve-bard
Enable the broker to select a compute node will the least number of open connections
2013-05-14 15:18:04 -07:00
cheddar 9a46c85bca Merge branch 'master' of github.com:metamx/druid 2013-05-14 17:00:25 -05:00
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