Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,414 Commits 113 Branches 506 Tags 732 MiB
Commit Graph

4414 Commits

Author SHA1 Message Date
Xavier Léauté 280681e84b add option to generate only api or only docs 2014-09-05 10:55:44 -07:00
fjy 963a44a8d4 Merge branch 'master' of github.com:metamx/druid 2014-09-05 10:15:47 -07:00
fjy eecda34940 fix tutorial with msg that no longer exists 2014-09-05 10:15:37 -07:00
Xavier Léauté f0d67fe873 deploy api docs 2014-09-04 16:13:43 -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
Xavier Léauté 3c131f4d13 update version in docs 2014-09-04 13:47:25 -07:00
xvrl c4c54f7bc9 Merge pull request #721 from metamx/fix-union-query 
fix Union Query result merging
 2014-09-04 12:20:19 -07:00
nishantmonu51 0dec5826ed remove unused imports 2014-09-05 00:07:42 +05:30
nishantmonu51 90632ecf3a review comment - have separate methods 2014-09-05 00:03:36 +05:30
fjy f473e62f1f Merge pull request #714 from metamx/cleanup-javadocs 
Cleanup javadocs
 2014-09-04 12:28:10 -06:00
fjy 6e75cb755d Merge pull request #719 from pdeva/master 
clarify division operation in post aggregation
 2014-09-04 11:26:42 -06:00
nishantmonu51 2772a78b3b review comments - move merging to tool chest 2014-09-04 11:31:04 +05:30
nishantmonu51 268a42bd79 fix Union Query result merging 2014-09-03 16:38:02 +05:30
fjy a4930375f3 Merge pull request #720 from metamx/fix-nested-groupby 
fix nested group by with hyperuniques
 2014-09-01 06:49:14 -06:00
nishantmonu51 c056960082 fix nested group by with hyperuniques 2014-09-01 10:50:09 +05:30
Xavier Léauté 23a2b84703 fix broken link, resolves #718 2014-08-31 21:51:12 +00:00
pdeva 1bad66c16d clarify division operation in post aggregation 2014-08-31 09:56:15 -07:00
Xavier Léauté 75134335de fix last merge from master not being forward-compatible 2014-08-30 22:45:36 -07:00
Xavier Léauté 508e982190 Merge remote-tracking branch 'origin/master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	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
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java
	services/pom.xml
 2014-08-30 22:42:36 -07:00
Xavier Léauté 6f45f88f26 fix post-aggregations broken link 2014-08-29 16:39:09 -07: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
Gian Merlino e3324137ef Merge pull request #716 from metamx/fix-jackson 
ensure jackson injection is available on startup
 2014-08-29 15:24:35 -07:00
xvrl 068a5fe2aa Merge pull request #715 from metamx/aggregator-factory-equals-hashcode 
AggregatorFactory equals() and hashCode() methods.
 2014-08-29 15:22:00 -07:00
Xavier Léauté 88de45c695 ensure jackson injection is available on startup 2014-08-29 15:13:52 -07:00
Gian Merlino 879e615314 AggregatorFactory equals() and hashCode() methods. 2014-08-29 15:02:04 -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
xvrl 6ffe40dcd8 Merge pull request #712 from metamx/indexing-extra-classpaths 
Allow indexing tasks to specify extra classpaths.
 2014-08-28 18:15:27 -07:00
Gian Merlino 8bcb73a0eb Java programs are best run with a java command. 2014-08-28 18:10:01 -07:00
Gian Merlino 5564a67bfc File.pathSeparator is better than ":". 2014-08-28 18:09:33 -07:00
Gian Merlino 578ca64e1e Merge pull request #711 from metamx/fix-maxtime-caching 
Fix maxtime caching
 2014-08-28 18:03:52 -07:00
Gian Merlino 68aeafaacd Allow indexing tasks to specify extra classpaths. 
This could be used by Hadoop tasks to reference configs for different clusters, assuming
that the possible configs have been pre-distributed to middle managers.
 2014-08-28 18:00:26 -07:00
Xavier Léauté 674e7b0447 add tests for timeboundary timewarp 2014-08-28 17:59:56 -07:00
Xavier Léauté 743a9bfdac fix offset and nulls 2014-08-28 17:35:26 -07:00
Xavier Léauté 9f742a87a6 fix timewarp with different bounds 2014-08-28 17:15:45 -07:00
Xavier Léauté b0b39d6ec0 fix maxTime caching for individual bounds 2014-08-28 17:14:25 -07:00
fjy 08b6a2677d Merge pull request #710 from metamx/update-druid-api 
Update Druid api
 2014-08-28 07:12:57 -06:00
nishantmonu51 df06874f84 Update Druid api 
Fixes DelimitedParseSpec serialization
 2014-08-28 18:24:30 +05:30
fjy 05224ad905 Merge pull request #700 from pdeva/master 
explain what 'full cluster view' means
 2014-08-28 06:33:38 -06: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
Xavier Léauté 248e6ed74e auto-version submodules for release 2014-08-27 12:19:56 -07:00
Gian Merlino 661e467d71 Fix groupBy/timeseries test, follow up to #705. 2014-08-26 22:36:08 -07:00
xvrl 0ddf667fef Merge pull request #705 from metamx/fix-timeseries-zero-filling 
Fix extraneous timeseries zero filling at end of data interval
 2014-08-26 22:07:51 -07:00
Xavier Léauté d15cd8fde7 add some comments about string interning 2014-08-26 21:33:38 -07:00
Gian Merlino 0eea1dc08d Test for desired timeseries zero-filling behavior. 2014-08-26 18:52:08 -07:00