3978 Commits

Author SHA1 Message Date
fjy
aa28bc0613 address cr 2014-09-15 13:14:23 -07:00
fjy
1615e1ac63 update druid api ver 2014-09-15 12:43:35 -07:00
fjy
cbf5076961 still propagate log 2014-09-12 11:43:42 -07:00
fjy
e62ed40d86 make some logs not emit 2014-09-11 16:49:18 -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 druid-0.6.153 2014-09-10 17:24:11 -07:00
fjy
62b0e21c56 Merge pull request #725 from metamx/fix-missing-context
fix for missing context when embedding broker
2014-09-09 15:42:00 -06:00
Xavier Léauté
d6f6a59ae2 fix for missing context when embedding broker 2014-09-09 14:25:56 -07:00
xvrl
fff16b613b update link 2014-09-09 10:12:13 -07:00
Xavier Léauté
17b6ed2cbe fix docs deploy 2014-09-05 11:44:34 -07:00
Xavier Léauté
958f2f9abd fix docs versions 2014-09-05 11:40:51 -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 druid-0.6.152 2014-09-05 11:07:14 -07:00
Xavier Léauté
c255bd76a9 add a test for the previous fix 2014-09-05 11:03:35 -07:00
Xavier Léauté
5dd23b19c3 fix interval start before end in TimewarpOperator 2014-09-05 10:55:45 -07:00
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 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 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 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