Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,201 Commits 111 Branches 503 Tags 725 MiB
Commit Graph

1071 Commits

Author SHA1 Message Date
Charles Allen 1c6cbea89c Revert "Revert "Overhaul of SegmentPullers to add consistency and retries"" 
This reverts commit f904bc7858.
 2015-03-30 13:40:04 -07:00
Fangjin Yang f904bc7858 Revert "Overhaul of SegmentPullers to add consistency and retries" 2015-03-30 13:15:50 -07:00
Charles Allen 6d407e8677 Add URI handling to SegmentPullers 
* Requires https://github.com/druid-io/druid-api/pull/37
* Requires https://github.com/metamx/java-util/pull/22
* Moves the puller logic to use a more standard workflow going through java-util helpers instead of re-writing the handlers for each impl
  * General workflow goes like this: 1) LoadSpec makes sure the correct Puller is called with the correct parameters. 2) The Puller sets up general information like how to make an InputStream, how to find a file name (for .gz files for example), and when to retry. 3) CompressionUtils does most of the heavy lifting when it can
 2015-03-30 12:33:23 -07:00
Xavier Léauté 2c58e355fd Merge pull request #1239 from metamx/log4j2forRealz 
Exclude log4j from curator dependencies in favor of log4j-1.2-api
 2015-03-26 13:21:13 -07:00
Charles Allen 9cd6c08e96 Exclude log4j from curator dependencies in favor of log4j-1.2-api 2015-03-26 13:05:12 -07:00
Xavier Léauté 389ea4c32f Merge pull request #1245 from b-slim/fix_injector_plus_ut 
Bug fix @DruidSecondaryModule plus unit test
 2015-03-26 10:04:44 -07:00
Slim Bouguerra 1e6be7796e bug fix @DruidSecondaryModule plus unit test 2015-03-26 10:44:52 -05:00
nishantmonu51 638bf9d4e9 return sorted List of TimeLineObjectHolder 2015-03-26 11:51:09 +05:30
fjy b389cfe404 [maven-release-plugin] prepare for next development iteration 2015-03-19 12:38:17 -07:00
fjy 60e7d543cc [maven-release-plugin] prepare release druid-0.7.1-rc1 2015-03-19 12:38:13 -07:00
Fangjin Yang 6bcdf7f60f Merge pull request #1223 from metamx/AnnounceIdUUID 
Add consistency to UUIDUtils handling
 2015-03-17 16:09:58 -07:00
Charles Allen 868100c79c Add consistency to UUIDUtils handling 
* Use "_" instead of "-"
 2015-03-17 16:05:46 -07:00
Fangjin Yang 8d0dfd9af1 Merge pull request #1221 from metamx/AnnounceIdUUID 
Change announcement ID to a UUID instead of Timestamp
 2015-03-17 15:38:53 -07:00
Charles Allen 79b1443cc3 Change announcement ID to a UUID instead of Timestamp 
* Also add a UUIDUtils to the common package
 2015-03-17 15:34:04 -07:00
nishantmonu51 f9821d242f also log author ip address in audit log 2015-03-17 23:15:15 +05:30
Xavier Léauté 7fb4b1d2bb Merge pull request #1144 from metamx/javaLoggingManager 
Add log4j2 hooks to other loggings
 2015-03-12 14:38:51 -07:00
Charles Allen edfcea18d8 Add log4j2 hooks to standard java logging 2015-03-12 14:29:41 -07:00
nishantmonu51 3ec4a30ab5 initial commit 
review comments

more refactoring and cleaning of redundant code

add UT + docs + more refactoring

fixes + review comments

more cleanup

end points to fetch history

review comments

remove unnecessary changes

review comments rename header name

review comments + add test for MetadataRulesManager

review comments docs
 2015-03-12 22:50:29 +05:30
Himanshu Gupta e6ee98e2d2 UTs update for common 2015-02-25 15:40:26 -08:00
Xavier Léauté 0784d7e30e Merge pull request #1152 from himanshug/metastorage-pwd-provider 
support for metadata store PasswordProvider interface
 2015-02-25 15:19:37 -08:00
Himanshu Gupta 126262edce support for PasswordProvider interface to enable writing druid extension which can get metadata store password from secured location or anywhere instead of plain text properties file 2015-02-25 14:05:19 -06:00
Xavier Léauté b167dcf82c [maven-release-plugin] prepare for next development iteration 2015-02-23 14:28:06 -08:00
Xavier Léauté e81ac2ba43 [maven-release-plugin] prepare release druid-0.7.0 2015-02-23 14:27:58 -08:00
Xavier Léauté 78df7f6165 Move Druid release artifacts to Sonatype 
- Switch to using Druid parent POM
- Add required fields for Sonatype
- Common plugin versions and settings have been moved to the parent pom
- Cleanup artifacts and POMs for consistent formatting
- Remove org.hyperic.sigar dependency and update docs to reflect necessary jars to add at runtime when sigar is needed
 2015-02-13 14:26:31 -08:00
fjy d29740ed9f [maven-release-plugin] prepare for next development iteration 2015-02-12 16:16:00 -08:00
fjy 211fd15b7e [maven-release-plugin] prepare release druid-0.7.0-rc3 2015-02-12 16:15:56 -08:00
nishantmonu51 e5fa8e0cb4 Fix NPE for union queries 
filter non-existing datasources for union queries.

handle review comment
 2015-02-10 23:21:58 +05:30
Fangjin Yang 25cf15824b Merge pull request #1085 from gianm/dsmrv-fix 
DataSourceMetadataResultValue fixes and JodaUtils adjustments.
 2015-02-03 17:51:33 -08:00
Gian Merlino 1298b4abd3 JodaUtils: Bring in MIN/MAX instants a bit. 
This prevents the difference overflowing a long.
 2015-02-03 17:34:33 -08:00
fjy 1f12c5b2f1 [maven-release-plugin] prepare for next development iteration 2015-02-03 12:06:49 -08:00
fjy e82d431be7 [maven-release-plugin] prepare release druid-0.7.0-rc2 2015-02-03 12:06:41 -08:00
fjy 3e5d338c8e Remove non friendly dependencies from Druid 2015-02-03 11:36:08 -08:00
Eric Tschetter 42eba986ce Towards consistent null handling 
This commit also includes
1) the addition of a context parameter on timeseries queries that allows it to ignore empty buckets instead of generating results for them
2) A cleanup of an unused method on an interface
 2015-02-02 12:53:07 -08:00
Fangjin Yang 92e616de11 Merge pull request #1077 from metamx/remove-unused-imports 
remove unused imports
 2015-02-02 10:45:27 -08:00
nishantmonu51 ba932bb1f2 remove unused imports 2015-02-02 21:53:39 +05:30
fjy d05032b98a towards a community led druid 2015-01-31 20:57:36 -08:00
fjy 1f94de22c6 [maven-release-plugin] prepare for next development iteration 2015-01-20 14:23:55 -08:00
fjy 17476edc31 [maven-release-plugin] prepare release druid-0.7.0-rc1 2015-01-20 14:23:51 -08:00
Charles Allen 3d27747f7e Upgrade to log4j2 
Default behavior is as before.
Added documentation for how to enable synchronous logging for select chatty classes:
* io.druid.client.ServerInventoryView
* io.druid.client.BatchServerInventoryView
* io.druid.curator.inventory.CuratorInventoryManager
* com.metamx.http.client.pool.ChannelResourceFactory
 2015-01-20 12:35:18 -08:00
fjy 84cc32ba32 Add more logging for when ingestion may be throttled 2015-01-08 14:51:46 -08:00
fjy 882874ce60 address cr 2014-12-16 11:37:38 -08:00
fjy b3999bbc6a update http client and fix log4j dependencies 2014-12-16 11:29:50 -08:00
fjy c0af7b2a5d fix broken ut 2014-12-15 18:29:15 -08:00
nishantmonu51 1a1b0e6f23 merge from master and review comments 2014-12-09 13:16:45 +05:30
Xavier Léauté 7871470491 fix jackson-annotations version dependencies 2014-12-08 15:31:58 -08:00
Xavier Léauté a79389a9e5 update joda-time and fix min/max instant 2014-12-02 17:27:22 -08:00
Charles Allen dc66e1708e Added src jar build to maven poms and re-formatted to conform to style guidelines. 2014-11-18 09:05:30 -08:00
nishantmonu51 cbffe3c648 merge from master and resolve conflicts 2014-11-17 18:07:08 +05:30
Xavier Léauté d19b895fb9 add tests for empty sequences 2014-11-13 14:49:13 -08:00
fjy 788a4a846b add encoding 2014-11-11 17:31:08 -08:00
Charles Allen a89b539b4f Merge pull request #823 from metamx/roaring 
Configurable bitmap indexes: roaring and concise
 2014-11-11 17:26:38 -08:00
fjy 1cc162727b address code review 2014-11-11 14:05:37 -08:00
Xavier Léauté 59f093882d fix Derby instantiation 2014-11-10 16:55:53 -08:00
fjy 8cbd21af90 fix defaults 2014-11-10 15:40:57 -08:00
fjy 98d05e63bf make derby instance only on coordinator 2014-11-10 15:34:49 -08:00
nishantmonu51 8bebb24fd5 Union Queries move merge to historical 2014-11-07 18:05:16 +05:30
Xavier Léauté 5bda4ee1dd global task entry type 2014-11-06 17:08:20 -08:00
Xavier Léauté ac753ed0f0 always use validation query 2014-11-06 17:08:01 -08:00
Xavier Léauté 10aa8a2d56 add explicit type names 2014-11-06 17:07:24 -08:00
Xavier Léauté 350bb09605 refactor sql storage to abstract task storage 2014-11-05 17:19:37 -08:00
Xavier Léauté 253c0a70b3 simplify interface + more tests 2014-11-04 15:03:13 -08:00
Xavier Léauté 696c9ba944 fix formatting 2014-10-31 13:32:18 -07:00
jisookim0513 a6016d70fc added deleted classes back 2014-10-31 13:10:09 -07:00
Xavier Léauté 9c06db021f rename db->metadata postgres->postgresql 2014-10-31 10:30:27 -07:00
Xavier Léauté fb4d41cedb make the injection gods happy 2014-10-30 21:16:36 -07:00
Xavier Léauté 377151beda better abstraction for metadatastorage 2014-10-30 18:23:35 -07:00
Xavier Léauté 3cc1b2e690 remove mysql dependencies + fix jdbc class loading 2014-10-29 17:30:43 -07:00
fjy 3b29e77866 [maven-release-plugin] prepare for next development iteration 2014-10-22 16:25:32 -07:00
fjy dcab2997f2 [maven-release-plugin] prepare release druid-0.6.160 2014-10-22 16:25:27 -07:00
jisookim0513 37979282fe enabled ansi-quote in mysql; insert statement should now work 2014-10-21 00:09:19 -07:00
jisookim0513 7d5c5f2083 fixed createTable; fixed miscellaneous stuff; added DerbyMetadataRuleManagerProvider 2014-10-17 00:10:36 -07:00
fjy a4c8f04409 [maven-release-plugin] prepare for next development iteration 2014-10-13 12:50:45 -07:00
fjy 7fd1747ffa [maven-release-plugin] prepare release druid-0.6.159 2014-10-13 12:50:41 -07:00
fjy d0fbd5f729 [maven-release-plugin] prepare for next development iteration 2014-10-09 14:24:53 -07:00
fjy dada60a301 [maven-release-plugin] prepare release druid-0.6.158 2014-10-09 14:24:48 -07:00
fjy 8a4b32c482 [maven-release-plugin] prepare for next development iteration 2014-10-07 14:30:26 -07:00
fjy 96e29c2fdd [maven-release-plugin] prepare release druid-0.6.157 2014-10-07 14:30:20 -07:00
fjy c7b4d5b7b4 Merge branch 'master' into druid-0.7.x 
Conflicts:
	processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java
 2014-10-02 18:12:10 -07:00
jisookim0513 0e50852985 fixed MetadataTaskStorage and handler 2014-09-30 14:09:23 -07:00
jisookim0513 9d7b5d9b0f fixed javadoc; fixed pom files; deleted unnecessary class 2014-09-30 13:47:35 -07:00
nishantmonu51 91eecfe3e7 fix #730 - memory check throws exception if fails 
fix exception handling, do not catch ProvisionException
 2014-09-30 23:03:40 +05:30
jisookim0513 74565c9371 cleaned up the code 2014-09-27 13:10:01 -07:00
jisookim0513 aa887edb73 added two seperate modules for mysql and postgres 2014-09-27 13:08:53 -07:00
jisookim0513 6a641621b2 finished merging into druid-0.7.x; derby not working (to be fixed) 2014-09-26 14:24:53 -07:00
jisookim0513 43cc6283d3 trying to revert files that have overwritten changes 2014-09-26 12:38:04 -07:00
fjy eaf0a48b92 Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
 2014-09-26 11:39:24 -07:00
jisookim0513 a5d02b9030 second attempt to fix merge-conflicts 2014-09-24 15:59:00 -07:00
jisookim0513 3bf39cc9f8 attempted to fix merge-conflicts 2014-09-24 15:55:42 -07:00
Xavier Léauté 7cfe86b7bc [maven-release-plugin] prepare for next development iteration 2014-09-23 16:31:25 -07:00
Xavier Léauté 80166314d9 [maven-release-plugin] prepare release druid-0.6.156 2014-09-23 16:31:21 -07:00
fjy 4235e14fc6 [maven-release-plugin] prepare for next development iteration 2014-09-23 16:12:43 -07:00
fjy 576e9b8a84 [maven-release-plugin] prepare release druid-0.6.155 2014-09-23 16:12:39 -07:00
jisookim0513 273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -07:00
fjy a17794a516 [maven-release-plugin] prepare for next development iteration 2014-09-16 15:22:55 -07:00
fjy f9c91ace3f [maven-release-plugin] prepare release druid-0.6.154 2014-09-16 15:22:49 -07:00
Xavier Léauté cfa92e8217 fix incorrect nullable annotations 2014-09-15 12:13:52 -07:00
fjy 469ccbbe5e Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java
	processing/src/main/java/io/druid/query/UnionQueryRunner.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java
	processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java
	processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/test/java/io/druid/server/initialization/JettyTest.java
	services/pom.xml
 2014-09-11 16:20:50 -07:00
Xavier Léauté 32e256a842 [maven-release-plugin] prepare for next development iteration 2014-09-10 17:24:15 -07:00
Xavier Léauté f7dc13d240 [maven-release-plugin] prepare release druid-0.6.153 2014-09-10 17:24:11 -07:00
Xavier Léauté 22553b0b28 [maven-release-plugin] prepare for next development iteration 2014-09-05 11:07:22 -07:00
Xavier Léauté 570a7a07bf [maven-release-plugin] prepare release druid-0.6.152 2014-09-05 11:07:14 -07:00
fjy e24be03a38 [maven-release-plugin] prepare for next development iteration 2014-09-04 14:10:13 -07:00
fjy a933ea1866 [maven-release-plugin] prepare release druid-0.6.151 2014-09-04 14:10:09 -07:00
fjy f473e62f1f Merge pull request #714 from metamx/cleanup-javadocs 
Cleanup javadocs
 2014-09-04 12:28:10 -06:00
Gian Merlino 96d7b18163 [maven-release-plugin] prepare for next development iteration 2014-08-29 15:29:58 -07:00
Gian Merlino 860cf36ab1 [maven-release-plugin] prepare release druid-0.6.150 2014-08-29 15:29:54 -07:00
Xavier Léauté 88de45c695 ensure jackson injection is available on startup 2014-08-29 15:13:52 -07:00
Xavier Léauté 58ab759fc6 remove unused imports 2014-08-29 14:03:47 -07:00
Xavier Léauté ac05836833 make Java 8 javadoc happy 2014-08-29 13:58:50 -07:00
Xavier Léauté daca178631 [maven-release-plugin] prepare for next development iteration 2014-08-29 10:43:19 -07:00
Xavier Léauté 0793a5aee6 [maven-release-plugin] prepare release druid-0.6.149 2014-08-29 10:43:15 -07:00
Xavier Léauté 1d6842c7f0 [maven-release-plugin] prepare for next development iteration 2014-08-27 12:22:53 -07:00
Xavier Léauté 575951f99a [maven-release-plugin] prepare release druid-0.6.148 2014-08-27 12:22:49 -07:00
fjy 00f7077f50 [maven-release-plugin] prepare for next development iteration 2014-08-22 08:28:56 -07:00
fjy df488563e4 [maven-release-plugin] prepare release druid-0.6.147 2014-08-22 08:28:51 -07:00
fjy df48b48e35 [maven-release-plugin] prepare for next development iteration 2014-08-21 12:50:33 -07:00
fjy 4f0b994037 [maven-release-plugin] prepare release druid-0.6.146 2014-08-21 12:50:30 -07:00
fjy 51988be776 [maven-release-plugin] prepare for next development iteration 2014-08-14 14:59:00 -07:00
fjy 2830028092 [maven-release-plugin] prepare release druid-0.6.145 2014-08-14 14:58:57 -07:00
fjy 4e3f4fbc22 [maven-release-plugin] prepare for next development iteration 2014-08-12 13:24:55 -07:00
fjy f3aafc246c [maven-release-plugin] prepare release druid-0.6.144 2014-08-12 13:24:50 -07:00
fjy 0cff63c7c6 [maven-release-plugin] prepare for next development iteration 2014-08-09 19:36:11 -07:00
fjy 724562b181 [maven-release-plugin] prepare release druid-0.6.143 2014-08-09 19:36:05 -07:00
fjy d58ae945a4 [maven-release-plugin] prepare for next development iteration 2014-08-08 16:22:38 -07:00
fjy d240479133 [maven-release-plugin] prepare release druid-0.6.142 2014-08-08 16:22:34 -07:00
fjy 199f2b1683 [maven-release-plugin] prepare for next development iteration 2014-08-08 15:53:53 -07:00
fjy 29a077d893 [maven-release-plugin] prepare release druid-0.6.141 2014-08-08 15:53:49 -07:00
fjy 958792db5c [maven-release-plugin] prepare for next development iteration 2014-08-08 15:16:38 -07:00
fjy 4482e1b7d8 [maven-release-plugin] prepare release druid-0.6.140 2014-08-08 15:16:34 -07:00
fjy ddcea18631 fix dependencies 2014-08-08 14:02:14 -07:00
fjy 74646f18f4 [maven-release-plugin] prepare for next development iteration 2014-08-08 11:40:52 -07:00
fjy 78c7140b52 [maven-release-plugin] prepare release druid-0.6.139 2014-08-08 11:40:46 -07:00
fjy 9f4dd7b33e [maven-release-plugin] prepare for next development iteration 2014-08-06 13:34:04 -07:00
fjy aa5cb91618 [maven-release-plugin] prepare release druid-0.6.138 2014-08-06 13:33:59 -07:00
fjy 65b8278add [maven-release-plugin] prepare for next development iteration 2014-08-01 10:14:34 -07:00
fjy 0ecbef6c5d [maven-release-plugin] prepare release druid-0.6.137 2014-08-01 10:14:30 -07:00
fjy bf8c24f88d [maven-release-plugin] prepare for next development iteration 2014-07-31 14:08:38 -07:00
fjy 66020fc2b6 [maven-release-plugin] prepare release druid-0.6.136 2014-07-31 14:08:34 -07:00
fjy a8c8e4cb51 [maven-release-plugin] prepare for next development iteration 2014-07-29 22:03:14 -07:00
fjy 25eda62a0c [maven-release-plugin] prepare release druid-0.6.135 2014-07-29 22:03:09 -07:00
fjy 0c898c58d1 [maven-release-plugin] prepare for next development iteration 2014-07-29 18:01:06 -07:00
fjy c8244d05d1 [maven-release-plugin] prepare release druid-0.6.134 2014-07-29 18:01:02 -07:00
fjy f7319620c4 [maven-release-plugin] prepare for next development iteration 2014-07-29 17:40:56 -07:00
fjy 540a146eaa [maven-release-plugin] prepare release druid-0.6.133 2014-07-29 17:40:52 -07:00
fjy b5ecf000ad [maven-release-plugin] prepare for next development iteration 2014-07-29 16:20:14 -07:00
fjy 877bd98667 [maven-release-plugin] prepare release druid-0.6.132 2014-07-29 16:20:10 -07:00
fjy e1d87ed5ea [maven-release-plugin] prepare for next development iteration 2014-07-29 14:13:41 -07:00
fjy c46965c52c [maven-release-plugin] prepare release druid-0.6.131 2014-07-29 14:13:37 -07:00
fjy 1de0f89718 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:55:50 -07:00
fjy 39bff5c1c2 [maven-release-plugin] prepare release druid-0.6.130 2014-07-18 11:55:46 -07:00
fjy 9e303527f2 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:17:56 -07:00
fjy ea04022772 [maven-release-plugin] prepare release druid-0.6.129 2014-07-18 11:17:52 -07:00
fjy 4c40e71e54 address cr 2014-06-19 14:48:46 -07:00
fjy 0bc1915067 Merge pull request #578 from metamx/new-guava 
Update guava, java-util, and druid-api
 2014-06-18 14:23:32 -06:00
Gian Merlino 7c7d170e78 [maven-release-plugin] prepare for next development iteration 2014-06-18 10:53:40 -07:00
Gian Merlino a52a1d3929 [maven-release-plugin] prepare release druid-0.6.128 2014-06-18 10:53:36 -07:00
Gian Merlino 9532beb05c [maven-release-plugin] prepare for next development iteration 2014-06-17 17:29:31 -07:00
Gian Merlino e3dcbde07d [maven-release-plugin] prepare release druid-0.6.127 2014-06-17 17:29:27 -07:00
Gian Merlino a658afe902 [maven-release-plugin] prepare for next development iteration 2014-06-17 13:01:01 -07:00
Gian Merlino 4e875b8084 [maven-release-plugin] prepare release druid-0.6.126 2014-06-17 13:00:54 -07:00
Gian Merlino 964f12b7d6 [maven-release-plugin] prepare for next development iteration 2014-06-16 16:56:44 -07:00
Gian Merlino 4e184e3793 [maven-release-plugin] prepare release druid-0.6.125 2014-06-16 16:56:37 -07:00
Gian Merlino ef7e786b96 [maven-release-plugin] prepare for next development iteration 2014-06-16 16:38:08 -07:00
Gian Merlino 96be9faec7 [maven-release-plugin] prepare release druid-0.6.124 2014-06-16 16:37:59 -07:00
Xavier Léauté a5c533dcab [maven-release-plugin] prepare for next development iteration 2014-06-13 15:17:00 -07:00
Xavier Léauté 903f1a695f [maven-release-plugin] prepare release druid-0.6.123 2014-06-13 15:16:36 -07:00
fjy 0fd57dbc75 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:05:18 -07:00
fjy bcc6e77919 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:05:14 -07:00
Xavier Léauté b7b28ad2f9 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 15:03:03 -07:00
Xavier Léauté 695a2946a9 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:01:13 -07:00
Xavier Léauté 83b2434cad [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:01:09 -07:00
Xavier Léauté bd18fef474 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:57:31 -07:00
Xavier Léauté 1159e2e415 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:56:12 -07:00
Xavier Léauté 6505f82053 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:54:23 -07:00
Xavier Léauté f6d319dac2 [maven-release-plugin] prepare for next development iteration 2014-06-13 14:46:08 -07:00
Xavier Léauté 394d0cfbca [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:45:43 -07:00
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
fjy 46ef5c4560 [maven-release-plugin] prepare for next development iteration 2014-06-05 10:03:31 -07:00
fjy 0265ae9ac0 [maven-release-plugin] prepare release druid-0.6.121 2014-06-05 10:03:26 -07:00
fjy e8aef86458 [maven-release-plugin] prepare for next development iteration 2014-06-04 20:22:31 -07:00
fjy 033f81ca64 [maven-release-plugin] prepare release druid-0.6.120 2014-06-04 20:22:14 -07:00
Gian Merlino 3325f6d6ed [maven-release-plugin] prepare for next development iteration 2014-06-04 17:56:20 -07:00
Gian Merlino 6309ab1973 [maven-release-plugin] prepare release druid-0.6.119 2014-06-04 17:56:15 -07:00
fjy 4524863db1 [maven-release-plugin] prepare for next development iteration 2014-06-04 16:49:49 -07:00
fjy 37c6ece150 [maven-release-plugin] prepare release druid-0.6.118 2014-06-04 16:49:44 -07:00
fjy 2d95780d12 [maven-release-plugin] prepare for next development iteration 2014-06-04 09:45:11 -07:00
fjy 30ce0ab99c [maven-release-plugin] prepare release druid-0.6.117 2014-06-04 09:45:06 -07:00
fjy 77ec4df797 update guava, java-util, and druid-api 2014-06-03 13:43:38 -07:00
fjy 1407b49da1 [maven-release-plugin] prepare for next development iteration 2014-06-02 10:53:47 -07:00
fjy f91ecf20f3 [maven-release-plugin] prepare release druid-0.6.116 2014-06-02 10:53:43 -07:00
fjy ee60183df7 [maven-release-plugin] prepare for next development iteration 2014-05-29 17:26:55 -07:00
fjy d13a354ffb [maven-release-plugin] prepare release druid-0.6.115 2014-05-29 17:26:49 -07:00
fjy 5ce80068d2 [maven-release-plugin] prepare for next development iteration 2014-05-20 13:22:52 -07:00
fjy 904c9049a7 [maven-release-plugin] prepare release druid-0.6.114 2014-05-20 13:22:48 -07:00
fjy 783f8fcc99 [maven-release-plugin] prepare for next development iteration 2014-05-20 12:47:33 -07:00
fjy def12c03bd [maven-release-plugin] prepare release druid-0.6.113 2014-05-20 12:47:29 -07:00
fjy e5454b47f1 [maven-release-plugin] prepare for next development iteration 2014-05-20 10:49:00 -07:00
fjy bcffb92181 [maven-release-plugin] prepare release druid-0.6.112 2014-05-20 10:48:53 -07:00
fjy dd59b58208 [maven-release-plugin] prepare for next development iteration 2014-05-19 21:17:09 -07:00
fjy 511aca9ea8 [maven-release-plugin] prepare release druid-0.6.111 2014-05-19 21:17:04 -07:00