2203 Commits

Author SHA1 Message Date
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
Xavier Léauté
8f7f497b55 jax-rs smile support 2014-10-07 14:19:59 -07:00
Xavier Léauté
30183d3b4d update druid-api for json parsing improvements 2014-10-07 13:25:02 -07:00
fjy
d4217f1588 Merge pull request #777 from metamx/initialized-endpoint
Historical endpoints accessible while loading + new loadstatus endpoint
2014-10-06 17:35:58 -06:00
Xavier Léauté
81641d7887 http accessible while loading + status endpoint 2014-10-06 13:32:27 -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
Gian Merlino
efa898422d Merge pull request #773 from metamx/cleanup-metrics
Use multi-val dims for metrics
2014-10-02 17:58:50 -07:00
fjy
816986f914 cleanup according to cr 2014-10-02 17:51:33 -07:00
fjy
75fb7986df Merge pull request #602 from metamx/offheap-incremental-index
Offheap incremental index
2014-10-01 16:20:24 -06:00
fjy
4fc0382d8a add more logging 2014-10-01 09:13:59 -07:00
nishantmonu51
ad75a21040 separate offheapIncrementalIndex implementation 2014-10-01 13:58:51 +05:30
fjy
c3bea245a7 fix up some bugs 2014-09-30 17:20:52 -07:00
fjy
5b166134fb add docs 2014-09-30 14:59:02 -07:00
fjy
6d2747adcf make loading local files easier 2014-09-30 14:50:48 -07:00
fjy
ee713f8e94 Merge pull request #727 from metamx/new-console-0.7.x
New console 0.7.x
2014-09-30 15:36:32 -06: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
fjy
0f96a09939 use multi-val dims for metrics 2014-09-30 13:36:01 -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
nishantmonu51
358ff915bb fix merge conflicts 2014-09-30 22:19:18 +05:30
nishantmonu51
2789536bed merge changes from druid-0.7.x 2014-09-30 22:05:49 +05:30
nishantmonu51
61c7fd2e6e make ingestOffheap tuneable 2014-09-30 15:30:02 +05:30
nishantmonu51
8cecb00aa9 upgrade jetty and workaround for half open connection
Upgrade jetty and set acceptor priority delta to -1
 to give priority to servicing connections already accepted rather than
opening new connections.
2014-09-30 14:22:16 +05:30
fjy
1a67ebe861 fix regression in test 2014-09-29 15:22:26 -07:00
nishantmonu51
adb4a65e0a Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-29 12:38:31 +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
fjy
fb1d6c177a fix dynamic config bug 2014-09-26 15:45:20 -07:00
jisookim0513
91bf8fadcf added MetadataSegmentManagerTest 2014-09-26 15:38:40 -07:00
jisookim0513
59b3e79c70 derby seems to be working..? 2014-09-26 14:36:17 -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
4244accab5 Merge branch 'druid-0.7.x' of github.com:metamx/druid into druid-0.7.x 2014-09-26 11:39:50 -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é
77c9afe92f try to make javadoc happy 2014-09-23 18:53:29 -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
Xavier Léauté
d02fd97ea3 fix comment 2014-09-23 16:25:46 -07:00
Xavier Léauté
8603d2fd3e keep default behavior 2014-09-23 16:23:02 -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
Xavier Léauté
35fb210cfa add test for parallel loading 2014-09-23 16:06:46 -07:00
Xavier Léauté
05d4f71ddc fix background annoucing race condition 2014-09-23 15:04:48 -07:00
Xavier Léauté
12449481e3 parallelize segment loading 2014-09-22 16:33:25 -07:00
nishantmonu51
f51ab84386 merge changes from druid-0.7.x 2014-09-22 23:48:45 +05:30
nishantmonu51
443e5788fb make OffheapIncrementalIndex tuneable 2014-09-22 19:26:10 +05:30
jisookim0513
273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -07:00