Commit Graph

988 Commits

Author SHA1 Message Date
fjy 27f7c45e91 [maven-release-plugin] prepare release druid-0.6.108 2014-05-07 12:40:10 -07:00
fjy 42994cebcd [maven-release-plugin] prepare for next development iteration 2014-05-07 11:25:50 -07:00
fjy 2bf5c3831d [maven-release-plugin] prepare release druid-0.6.107 2014-05-07 11:25:45 -07:00
fjy b6fb4245aa Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDriverConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfigBuilder.java
	pom.xml
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java
2014-05-06 14:32:51 -07:00
Gian Merlino 6f3f5c6e99 [maven-release-plugin] prepare for next development iteration 2014-05-06 11:28:39 -07:00
Gian Merlino a5a875e1ed [maven-release-plugin] prepare release druid-0.6.106 2014-05-06 11:28:34 -07:00
fjy 544c0f08f6 Merge pull request #459 from metamx/move-firehose
Move the event receiver firehose such that standalone realtime nodes can use it
2014-05-05 17:09:43 -06:00
fjy 42c2fcb6b4 Merge pull request #518 from metamx/server-select
Smarter server selection at the broker level
2014-05-05 17:09:15 -06:00
fjy e0bce3168c [maven-release-plugin] prepare for next development iteration 2014-05-01 15:09:01 -07:00
fjy dd0004b759 [maven-release-plugin] prepare release druid-0.6.105 2014-05-01 15:08:57 -07:00
fjy 015000ee8f [maven-release-plugin] prepare for next development iteration 2014-04-30 13:16:24 -07:00
fjy eae7d55dce [maven-release-plugin] prepare release druid-0.6.104 2014-04-30 13:16:20 -07:00
fjy 7700001e27 [maven-release-plugin] prepare for next development iteration 2014-04-30 10:45:20 -07:00
fjy 1e639792bf [maven-release-plugin] prepare release druid-0.6.103 2014-04-30 10:45:14 -07:00
fjy 9ad0da0794 [maven-release-plugin] prepare for next development iteration 2014-04-30 10:26:38 -07:00
fjy 5b7b29b61b [maven-release-plugin] prepare release druid-0.6.102 2014-04-30 10:26:34 -07:00
fjy e90eb4b83a add custom tier selector 2014-04-28 15:31:15 -07:00
fjy 9de170540b fix bug with selection in cli 2014-04-28 14:00:53 -07:00
fjy 3c3daf452e Smarter server selection at the router level 2014-04-28 13:58:10 -07:00
fjy 171d20d52d Merge branch 'move-firehose' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:19 -07:00
fjy eef034ca7e Merge branch 'master' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:08 -07:00
fjy 76e0a48527 Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DbUpdaterJob.java
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-04-25 14:03:28 -07:00
Xavier Léauté f88cb13ccb [maven-release-plugin] prepare for next development iteration 2014-04-24 17:27:58 -07:00
Xavier Léauté b8c14ba061 [maven-release-plugin] prepare release druid-0.6.101 2014-04-24 17:27:46 -07:00
fjy 5e98275251 [maven-release-plugin] prepare for next development iteration 2014-04-24 11:47:52 -07:00
fjy 35dc96e946 [maven-release-plugin] prepare release druid-0.6.100 2014-04-24 11:47:47 -07:00
fjy bec171fea9 [maven-release-plugin] prepare for next development iteration 2014-04-22 17:10:33 -07:00
fjy 67972ca5c5 [maven-release-plugin] prepare release druid-0.6.99 2014-04-22 17:10:27 -07:00
xvrl 4c7399bfbf Merge pull request #503 from metamx/pulldeps
PullDependencies changes.
2014-04-22 14:40:59 -07:00
Gian Merlino 8d650ae131 PullDependencies changes.
- Pull default Hadoop version by default.
- Allow additional coordinates on the command line.
2014-04-22 14:33:53 -07:00
fjy bed8860fd4 [maven-release-plugin] prepare for next development iteration 2014-04-21 22:34:43 -07:00
fjy 594bb65ba6 [maven-release-plugin] prepare release druid-0.6.98 2014-04-21 22:34:38 -07:00
fjy 357cd66f66 [maven-release-plugin] prepare for next development iteration 2014-04-21 22:26:28 -07:00
fjy 93ed56f680 [maven-release-plugin] prepare release druid-0.6.97 2014-04-21 22:26:23 -07:00
fjy 310073685d [maven-release-plugin] prepare for next development iteration 2014-04-21 12:16:39 -07:00
fjy 1778d9adf4 [maven-release-plugin] prepare release druid-0.6.96 2014-04-21 12:16:35 -07:00
fjy 65db875d68 [maven-release-plugin] prepare for next development iteration 2014-04-18 17:44:36 -07:00
fjy 2d3eebe995 [maven-release-plugin] prepare release druid-0.6.95 2014-04-18 17:44:32 -07:00
Gian Merlino 265ac37cdc [maven-release-plugin] prepare for next development iteration 2014-04-18 11:53:43 -07:00
Gian Merlino 5162864731 [maven-release-plugin] prepare release druid-0.6.94 2014-04-18 11:53:38 -07:00
fjy c00fb1d08e Merge pull request #445 from metamx/hadoop-version-update
Hadoop version update
2014-04-17 19:16:44 -06:00
fjy 1fcb3e01c3 [maven-release-plugin] prepare for next development iteration 2014-04-17 15:30:30 -07:00
fjy e9b77c4434 [maven-release-plugin] prepare release druid-0.6.93 2014-04-17 15:30:26 -07:00
fjy 66a8ff9390 [maven-release-plugin] prepare for next development iteration 2014-04-16 11:40:35 -07:00
fjy 6621c4f321 [maven-release-plugin] prepare release druid-0.6.92 2014-04-16 11:40:30 -07:00
fjy b26a40aeaf [maven-release-plugin] prepare for next development iteration 2014-04-16 11:26:34 -07:00
fjy 8ee8927267 [maven-release-plugin] prepare release druid-0.6.91 2014-04-16 11:26:28 -07:00
fjy a87213e15f point code docs to latest instead of a version 2014-04-16 10:50:39 -07:00
fjy 51e2da9d8d use a separate annotation for the router, less confusing 2014-04-16 10:08:58 -07:00
fjy 24a0268036 cleanup code in router and add forwarding for get requests 2014-04-16 09:36:18 -07:00
fjy 6893282a65 [maven-release-plugin] prepare for next development iteration 2014-04-15 14:26:57 -07:00
fjy 7e9166d20c [maven-release-plugin] prepare release druid-0.6.90 2014-04-15 14:26:53 -07:00
fjy 508cf6a4f7 Merge branch 'master' of github.com:metamx/druid 2014-04-15 14:23:58 -07:00
fjy 9b06b6aa58 misc fixes for router 2014-04-15 14:23:54 -07:00
Xavier Léauté 077dd7c589 enable cache monitor on computes by default 2014-04-14 16:11:12 -07:00
fjy db5f04c84d [maven-release-plugin] prepare for next development iteration 2014-04-10 15:39:41 -07:00
fjy 87ef64f577 [maven-release-plugin] prepare release druid-0.6.89 2014-04-10 15:39:36 -07:00
fjy b273f1b101 [maven-release-plugin] prepare for next development iteration 2014-04-10 12:56:20 -07:00
fjy 9019990d94 [maven-release-plugin] prepare release druid-0.6.88 2014-04-10 12:56:16 -07:00
fjy 57bf8faa82 [maven-release-plugin] prepare for next development iteration 2014-04-10 11:33:06 -07:00
fjy 20c7b73269 [maven-release-plugin] prepare release druid-0.6.87 2014-04-10 11:33:02 -07:00
fjy 88c592ccaa add more meaningful request logging 2014-04-10 10:37:25 -07:00
nishantmonu51 ea8b2dffd5 Add chatHandlerResource 2014-04-09 14:25:18 +05:30
fjy 6209803d50 [maven-release-plugin] prepare for next development iteration 2014-04-08 16:27:44 -07:00
fjy ac9d20af47 [maven-release-plugin] prepare release druid-0.6.86 2014-04-08 16:27:40 -07:00
fjy 7db756f819 prepare for next release 2014-04-08 16:25:59 -07:00
fjy 29c3db92b5 [maven-release-plugin] prepare for next development iteration 2014-04-08 11:44:45 -07:00
fjy d16ff98ef3 [maven-release-plugin] prepare release druid-0.6.85 2014-04-08 11:44:40 -07:00
fjy a4df23f092 prepare for next release 2014-04-08 11:42:59 -07:00
nishantmonu51 c6f4b344cb add bindings for chat handler provider 2014-04-08 11:56:23 +05:30
fjy 8e3bcc8fc3 [maven-release-plugin] prepare for next development iteration 2014-04-07 14:38:55 -07:00
fjy e1e81cfeac [maven-release-plugin] prepare release druid-0.6.84 2014-04-07 14:38:51 -07:00
fjy 4ef2bbbfc1 prepare for next release 2014-04-07 14:37:02 -07:00
fjy bfb66691b9 [maven-release-plugin] prepare for next development iteration 2014-04-07 12:45:28 -07:00
fjy f612b7cc64 [maven-release-plugin] prepare release druid-0.6.83 2014-04-07 12:45:20 -07:00
fjy 2e9579a146 prepare for next release 2014-04-07 12:43:30 -07:00
fjy 1843316db6 commonalize event receiver firehose 2014-04-03 20:46:36 -07:00
fjy 8138d96f9d [maven-release-plugin] prepare for next development iteration 2014-04-03 17:21:14 -07:00
fjy 4619e498c3 [maven-release-plugin] prepare release druid-0.6.82 2014-04-03 17:21:10 -07:00
fjy 5d8d506fe8 fix commented out filters 2014-04-03 17:06:28 -07:00
fjy d9062d91fa fix endpoint bugs and more docs 2014-04-03 17:01:33 -07:00
fjy edba3ba40e [maven-release-plugin] prepare for next development iteration 2014-04-02 22:24:36 -07:00
fjy 0f0e525a75 [maven-release-plugin] prepare release druid-0.6.81 2014-04-02 22:24:32 -07:00
fjy b0bf08554a fix broken build 2014-04-02 22:22:42 -07:00
fjy e53d107472 revert broken cache 2014-04-02 22:12:22 -07:00
fjy 133c624f69 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:33:10 -07:00
fjy 4e2ac3234c [maven-release-plugin] prepare release druid-0.6.79 2014-04-02 21:33:05 -07:00
fjy ea9f31bbe0 learn to math and prepare for next release 2014-04-02 21:31:17 -07:00
fjy 6bab22ef71 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:08:18 -07:00
fjy 93e19b62e6 [maven-release-plugin] prepare release druid-0.6.78 2014-04-02 21:08:14 -07:00
fjy f185d215e1 fix jetty default thread pool size for jetty 9 and prepare for next release 2014-04-02 21:01:07 -07:00
fjy 6cd5a76983 [maven-release-plugin] prepare for next development iteration 2014-04-02 17:33:26 -07:00
fjy d1e7b98177 [maven-release-plugin] prepare release druid-0.6.77 2014-04-02 17:33:19 -07:00
fjy fc94b847c3 prepare for next release 2014-04-02 17:31:19 -07:00
fjy 7547e989f0 Merge pull request #456 from metamx/processing-threads-default
more sensible defaults
2014-04-02 18:25:43 -06:00
fjy 43a0554179 Merge pull request #455 from metamx/async
Asynchronous servlet for query forwarding
2014-04-02 18:05:49 -06:00
Xavier Léauté 2eb9493010 fix documentation link 2014-04-02 15:27:49 -07:00
fjy 1866cbad1b remove unneeded comment 2014-04-01 18:15:51 -07:00
fjy eaec0e3ab2 cleanup 2014-04-01 17:56:25 -07:00
fjy 6952eb7878 asynch servlet for query forwarding 2014-04-01 17:51:28 -07:00
Xavier Léauté 74c5d9889b [maven-release-plugin] prepare for next development iteration 2014-03-31 16:07:31 -07:00
Xavier Léauté 0845cc4078 [maven-release-plugin] prepare release druid-0.6.76 2014-03-31 16:07:25 -07:00
fjy 652506d1bd [maven-release-plugin] prepare for next development iteration 2014-03-27 18:03:55 -07:00
fjy 7fa62cd9c7 [maven-release-plugin] prepare release druid-0.6.75 2014-03-27 18:03:51 -07:00
nishantmonu51 06b53f02a8 upgrade default version in CluHadoopIndexer and merge from master 2014-03-27 03:37:45 +05:30
fjy 7e54c6a359 [maven-release-plugin] prepare for next development iteration 2014-03-25 13:43:25 -07:00
fjy 0baf95098d [maven-release-plugin] prepare release druid-0.6.74 2014-03-25 13:43:21 -07:00
fjy 5169249ed5 Merge pull request #429 from metamx/compute-populate-cache
Enable historical node to populate cache
2014-03-25 12:03:26 -06:00
fjy eec07ad45f Merge branch 'master' of github.com:metamx/druid
Conflicts:
	services/src/main/java/io/druid/cli/CliHadoopIndexer.java
2014-03-25 10:04:14 -07:00
fjy b6dd2fae64 update some comments on standalone hadoop indexer 2014-03-25 10:03:40 -07:00
nishantmonu51 fe7a184096 review comments 2014-03-25 17:02:36 +05:30
nishantmonu51 0ba72ffb2b merge from master 2014-03-25 15:43:05 +05:30
nishantmonu51 6a34c09e05 Merge branch 'master' into compute-populate-cache 2014-03-25 13:23:00 +05:30
fjy 5ebb2d27e3 fix hadoop 2014-03-24 18:43:31 -07:00
fjy 75ec8bed9a address code review comments 2014-03-24 14:53:30 -07:00
fjy fcd7522596 Merge branch 'master' into router-node 2014-03-24 13:43:52 -07:00
fjy e523bfc237 [maven-release-plugin] prepare for next development iteration 2014-03-21 11:07:40 -07:00
fjy 6fbc3b15a7 [maven-release-plugin] prepare release druid-0.6.73 2014-03-21 11:07:34 -07:00
fjy 55169175de prepare for next release 2014-03-21 11:05:54 -07:00
nishantmonu51 69e9b7a6c5 merge changes from master 2014-03-20 20:23:58 +05:30
fjy ab2524ba0a add router node 2014-03-18 13:44:29 -07:00
fjy 03851101f0 [maven-release-plugin] prepare for next development iteration 2014-03-18 08:12:51 -07:00
fjy 508d892ba1 [maven-release-plugin] prepare release druid-0.6.72 2014-03-18 08:12:44 -07:00
fjy 804a4051fa prepare for next rel 2014-03-18 08:10:59 -07:00
fjy 294f15d624 [maven-release-plugin] prepare for next development iteration 2014-03-17 21:44:17 -07:00
fjy 199efa049a [maven-release-plugin] prepare release druid-0.6.71 2014-03-17 21:44:11 -07:00
fjy 1d1ec1d855 clean up some defaults and prepare for next release 2014-03-17 21:41:34 -07:00
Xavier Léauté b9fe12977e [maven-release-plugin] prepare for next development iteration 2014-03-17 13:57:10 -07:00
Xavier Léauté 0276223db1 [maven-release-plugin] prepare release druid-0.6.70 2014-03-17 13:57:06 -07:00
fjy 2adcf07f5f Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-03-17 10:59:31 -07:00
nishantmonu51 468e8e0b31 Memcache changes 2014-03-17 18:54:30 +05:30
fjy 8e5cbca2ee [maven-release-plugin] prepare for next development iteration 2014-03-14 15:16:55 -07:00
fjy 852d167eaf [maven-release-plugin] prepare release druid-0.6.69 2014-03-14 15:16:50 -07:00
fjy f1da044cfa fix another breaking endpoint in druid coordinator 2014-03-14 15:15:08 -07:00
fjy 7a2d0850e3 [maven-release-plugin] prepare for next development iteration 2014-03-14 15:06:54 -07:00
fjy 2646b5421b [maven-release-plugin] prepare release druid-0.6.68 2014-03-14 15:06:50 -07:00
fjy f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00
fjy f0fdfbb2f7 fix broken constant post agg 2014-03-14 14:54:52 -07:00
fjy 454a240525 [maven-release-plugin] prepare for next development iteration 2014-03-14 10:59:27 -07:00
fjy 6e9bc9acab [maven-release-plugin] prepare release druid-0.6.66 2014-03-14 10:59:23 -07:00
fjy b3fb2fea9c prepare for next release 2014-03-14 10:57:43 -07:00
nishantmonu51 04f3d0a13a fix cli hadoop indexer
* run determine partitions job using CLI
2014-03-11 16:36:19 +05:30
fjy 34957ee471 [maven-release-plugin] prepare for next development iteration 2014-03-10 15:05:48 -07:00
fjy 35297572ed [maven-release-plugin] prepare release druid-0.6.65 2014-03-10 15:05:43 -07:00
fjy ae2dc6506c fix broken granularity 2014-03-10 15:03:43 -07:00
fjy 369156fe80 [maven-release-plugin] prepare for next development iteration 2014-03-10 13:26:38 -07:00
fjy ba3806fcc2 [maven-release-plugin] prepare release druid-0.6.64 2014-03-10 13:26:34 -07:00
fjy 243af486cf prepare for next release 2014-03-10 13:24:53 -07:00
fjy 00c5a708a2 [maven-release-plugin] prepare for next development iteration 2014-03-06 12:55:11 -08:00
fjy 9599832c58 [maven-release-plugin] prepare release druid-0.6.63 2014-03-06 12:55:06 -08:00
fjy e1fac64298 prepare for next release 2014-03-06 12:53:05 -08:00
fjy 46b9ac78e7 Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	pom.xml
	publications/whitepaper/druid.pdf
	publications/whitepaper/druid.tex
2014-03-03 14:48:15 -08:00
fjy 37a79dd4cb [maven-release-plugin] prepare for next development iteration 2014-02-27 11:52:40 -08:00
fjy 8cdd0e3d53 [maven-release-plugin] prepare release druid-0.6.62 2014-02-27 11:52:35 -08:00
fjy 7b0b90a860 Merge branch 'master' of github.com:metamx/druid into new-schema 2014-02-20 16:12:31 -08:00
fjy 5d2367f0fd unit tests pass at this point 2014-02-20 15:52:12 -08:00
fjy ab83cba790 Merge pull request #393 from metamx/group-by-improvements
Group by memory usage improvements
2014-02-19 19:52:37 -07:00
fjy c57cf6ab4d [maven-release-plugin] prepare for next development iteration 2014-02-14 15:24:15 -08:00
fjy 44755cc91c [maven-release-plugin] prepare release druid-0.6.61 2014-02-14 15:24:11 -08:00
fjy fb93448e9d prepare for next release because my last one failzored out of bad internetz 2014-02-14 15:22:27 -08:00
fjy f5affb6b5a [maven-release-plugin] prepare for next development iteration 2014-02-14 15:09:30 -08:00
fjy 189376f495 [maven-release-plugin] prepare release druid-0.6.60 2014-02-14 15:09:26 -08:00
fjy 1a8f9f2e12 prepare for next release 2014-02-14 15:07:44 -08:00
fjy 82fd35726f [maven-release-plugin] prepare for next development iteration 2014-02-12 20:03:00 -08:00
fjy cc1b91636f [maven-release-plugin] prepare release druid-0.6.59 2014-02-12 20:02:55 -08:00
fjy a986166b9c prepare for next release 2014-02-12 20:01:05 -08:00
nishantmonu51 3302cff6db groupBy improvements 2014-02-12 00:51:10 +05:30
fjy b7a78680b2 [maven-release-plugin] prepare for next development iteration 2014-02-07 13:06:23 -08:00
fjy cc6886646e [maven-release-plugin] prepare release druid-0.6.58 2014-02-07 13:06:18 -08:00
fjy 2497bd2e85 prepare for next release 2014-02-07 13:04:34 -08:00
fjy 555f434fa6 [maven-release-plugin] prepare for next development iteration 2014-02-07 11:56:41 -08:00
fjy 371f2bb941 [maven-release-plugin] prepare release druid-0.6.57 2014-02-07 11:56:34 -08:00
fjy c8b350270f prepare for next release 2014-02-07 11:54:56 -08:00
fjy 056e82a516 [maven-release-plugin] prepare for next development iteration 2014-02-04 15:23:34 -08:00
fjy 0ea45b590f [maven-release-plugin] prepare release druid-0.6.56 2014-02-04 15:23:30 -08:00
fjy fc4cd79125 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:47:50 -08:00
fjy 4d52e20fe1 [maven-release-plugin] prepare release druid-0.6.55 2014-02-03 16:47:46 -08:00
fjy 46571ddf69 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:35:02 -08:00
fjy cebb46a259 [maven-release-plugin] prepare release druid-0.6.54 2014-02-03 16:34:57 -08:00
fjy 21d518e15c [maven-release-plugin] prepare for next development iteration 2014-01-31 16:32:25 -08:00
fjy 84f434d9f4 [maven-release-plugin] prepare release druid-0.6.53 2014-01-31 16:32:21 -08:00
fjy 8edf0cf136 more backwards compatability fix 2014-01-26 21:27:34 +08:00
fjy 158a725985 fix backwards compat issues 2014-01-26 20:07:09 +08:00
fjy f3e1cbc423 fix according to code review 2014-01-21 16:26:28 -08:00
fjy e2ea2ec7fd Merge branch 'master' into az
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java
2014-01-20 15:10:13 -08:00
fjy 215584891e Merge branch 'master' into moar-endpoints 2014-01-20 13:06:45 -08:00
fjy 6404967994 fixes 2014-01-20 13:05:05 -08:00
fjy 8d01a46d02 actually register resources 2014-01-17 18:01:09 -08:00
fjy 57e022f446 [maven-release-plugin] prepare for next development iteration 2014-01-17 15:53:54 -08:00
fjy 6540b2a58e [maven-release-plugin] prepare release druid-0.6.52 2014-01-17 15:53:50 -08:00
fjy f898c29e20 fix batch indexing and prepare for next release 2014-01-17 15:52:04 -08:00
fjy 26a0f862fb [maven-release-plugin] prepare for next development iteration 2014-01-14 17:35:45 -08:00
fjy 3737ac4966 [maven-release-plugin] prepare release druid-0.6.51 2014-01-14 17:35:40 -08:00
fjy 0ceda034cd fix dependency issue and prepare for next release 2014-01-14 17:34:02 -08:00
fjy 528efedf52 [maven-release-plugin] prepare for next development iteration 2014-01-14 16:08:47 -08:00
fjy b4e4a5df96 [maven-release-plugin] prepare release druid-0.6.50 2014-01-14 16:08:43 -08:00
fjy 187bb84b45 prepare for next release 2014-01-14 16:07:05 -08:00
fjy 4a9c255cde [maven-release-plugin] prepare for next development iteration 2014-01-14 09:56:34 -08:00
fjy d8ac5575bc [maven-release-plugin] prepare release druid-0.6.49 2014-01-14 09:56:30 -08:00
fjy 9184906c39 prepare for next release 2014-01-14 09:54:42 -08:00
fjy 396311a547 [maven-release-plugin] prepare for next development iteration 2014-01-13 18:04:29 -08:00
fjy 9c9d6287a2 [maven-release-plugin] prepare release druid-0.6.48 2014-01-13 18:04:24 -08:00
fjy e8d61ffe99 prepare for next release 2014-01-13 18:02:24 -08:00
fjy f123a14373 Merge branch 'master' into az
Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java
2014-01-09 19:09:38 -08:00
Xavier Léauté 632d6b0a78 make server selection configurable, add back random server selection 2014-01-09 14:37:33 -08:00
fjy f44509b530 queries working at this point, tests pass, still need more tests and fix rules interface 2014-01-07 16:24:53 -08:00
fjy e11952f3b6 bridge is kinda working for mastery stuff right now, tests pass 2014-01-06 17:01:50 -08:00
fjy 2b46c1d292 [maven-release-plugin] prepare for next development iteration 2014-01-02 19:53:41 -08:00
fjy 7a0f634b02 [maven-release-plugin] prepare release druid-0.6.47 2014-01-02 19:53:35 -08:00
Xavier Léauté 95d92915bf more tests for Initialization + dependency cleanup 2013-12-30 16:31:10 -08:00
Gian Merlino 668cf009a0 [maven-release-plugin] prepare for next development iteration 2013-12-20 12:28:54 -08:00
Gian Merlino bd58def933 [maven-release-plugin] prepare release druid-0.6.46 2013-12-20 12:28:49 -08:00
Gian Merlino bbe1b82347 Update versions 2013-12-20 12:26:27 -08:00
Gian Merlino 9043c211b2 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:25:36 -08:00
Gian Merlino 29c0fa1df9 [maven-release-plugin] prepare release druid-0.6.45 2013-12-20 11:25:31 -08:00
Gian Merlino 4bc8ff4d6a Update versions 2013-12-20 11:19:36 -08:00
Gian Merlino 5711ac4aff [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 3b15f6a834 [maven-release-plugin] prepare release druid-0.6.44 2013-12-20 11:17:01 -08:00
Gian Merlino c503f5e9c5 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 97095ee3db [maven-release-plugin] prepare release druid-0.6.43 2013-12-20 11:17:00 -08:00
fjy fba6caf7fd Merge pull request #326 from metamx/versions
StatusResource
2013-12-18 22:44:50 -08:00
Gian Merlino 25c3f28907 [maven-release-plugin] prepare for next development iteration 2013-12-18 18:38:27 -08:00
Gian Merlino 6a740768d6 [maven-release-plugin] prepare release druid-0.6.42 2013-12-18 18:38:22 -08:00
Gian Merlino 8d8ec51c9c [maven-release-plugin] prepare for next development iteration 2013-12-18 16:05:33 -08:00
Gian Merlino 00d651bf6f [maven-release-plugin] prepare release druid-0.6.41 2013-12-18 16:05:27 -08:00
Gian Merlino d0fd58bbae [maven-release-plugin] prepare for next development iteration 2013-12-18 15:35:55 -08:00
Gian Merlino 231d7a6d1f [maven-release-plugin] prepare release druid-0.6.40 2013-12-18 15:35:50 -08:00
Gian Merlino fc4dd51194 Update versions 2013-12-18 15:33:25 -08:00
Hagen Rother fd427a3328 bump the maven shader plugin and config 2013-12-18 17:30:12 +01:00
fjy 494ec53050 [maven-release-plugin] prepare for next development iteration 2013-12-17 17:48:46 -08:00
fjy 2a98a4d3e0 [maven-release-plugin] prepare release druid-0.6.39 2013-12-17 17:48:42 -08:00
fjy d112b2d211 prepare for next release 2013-12-17 17:47:04 -08:00
fjy 0051877f84 fix status endpoint 2013-12-17 17:46:16 -08:00
fjy 5932150d24 [maven-release-plugin] prepare for next development iteration 2013-12-17 16:29:53 -08:00
fjy ed9f4b4cf2 [maven-release-plugin] prepare release druid-0.6.38 2013-12-17 16:29:49 -08:00
fjy 07875dd30b prepare for next release 2013-12-17 16:28:11 -08:00
fjy 69f33b0acd remove commented line 2013-12-17 16:24:15 -08:00
fjy bbb2754a7c fix redirects in druid 2013-12-17 16:22:36 -08:00
fjy 48d677d135 [maven-release-plugin] prepare for next development iteration 2013-12-16 16:17:45 -08:00
fjy 7e0b4d4fd2 [maven-release-plugin] prepare release druid-0.6.37 2013-12-16 16:17:41 -08:00
fjy f2241c8885 prepare for next release 2013-12-16 16:16:00 -08:00
Xavier Léauté ac2ca0e46c separate move and archive tasks 2013-12-16 14:00:55 -08:00
Xavier Léauté a417cd5df2 add archive task 2013-12-16 13:59:15 -08:00
fjy 84233238b1 Merge branch 'master' of github.com:metamx/druid 2013-12-16 12:01:55 -08:00
fjy 0998d835b0 fix redirection issues with master and overlord 2013-12-16 12:01:52 -08:00
Gian Merlino 7759ed4517 Coordinator: Link service announcement to leadership 2013-12-16 11:28:28 -08:00
Himadri Singh 3752122a7b implementing comments from review 2013-12-16 15:16:28 +05:30
fjy 3812bf7215 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:57:07 -08:00
fjy a7ff58f877 [maven-release-plugin] prepare release druid-0.6.36 2013-12-13 16:57:02 -08:00
fjy 87b83bceb1 fix task storage config serde and prepare for next release 2013-12-13 16:55:22 -08:00
fjy 41d64f4aa6 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:47:21 -08:00
fjy 1c050a02f8 [maven-release-plugin] prepare release druid-0.6.35 2013-12-13 16:47:17 -08:00
fjy 01f9c1df31 fix broken task storage config and prepare for next release 2013-12-13 16:45:32 -08:00
fjy 7891e0a2e2 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:20:23 -08:00
fjy 1d75738f81 [maven-release-plugin] prepare release druid-0.6.34 2013-12-13 16:20:18 -08:00
fjy 9a5fd6b0e9 prepare for next release 2013-12-13 16:18:34 -08:00
Gian Merlino 600dc7546f Configurability of recency threshold 2013-12-13 16:02:54 -08:00
fjy 407f8caf94 remove server monitor from list of default monitors 2013-12-13 09:04:32 -08:00
fjy aef7726c33 [maven-release-plugin] prepare for next development iteration 2013-12-12 18:53:18 -08:00
fjy 1d1baf5976 [maven-release-plugin] prepare release druid-0.6.33 2013-12-12 18:53:14 -08:00
fjy 25ebba2c38 fix default start delay of indexing service and prepare for next release 2013-12-12 18:51:25 -08:00
fjy f920dd6fb2 [maven-release-plugin] prepare for next development iteration 2013-12-12 17:28:38 -08:00
fjy 857d24a4ca [maven-release-plugin] prepare release druid-0.6.32 2013-12-12 17:28:34 -08:00
fjy 19eafe0e96 prepare for next release 2013-12-12 17:26:50 -08:00
fjy 7c744ffda0 [maven-release-plugin] prepare for next development iteration 2013-12-12 14:53:01 -08:00
fjy 365da245c2 [maven-release-plugin] prepare release druid-0.6.31 2013-12-12 14:52:57 -08:00
fjy a58f90a689 prepare for next release 2013-12-12 14:51:14 -08:00
Gian Merlino 70c153592f CliPeon: Fix local mode 2013-12-12 14:22:57 -08:00
Gian Merlino c4b8c8bc6f Rework indexing service internals to hopefully be more reliable.
The TaskQueue directly manages the TaskRunner. The main management loop runs
periodically and checks that the runner is doing reasonable things. If not, it
attempts to adjust the runner. The management loop also runs on-demand when a
task is added to keep task assignment relatively low latency. The TaskConsumer
is no longer necessary and so it no longer exists.

Task interval locks are handled differently. Instead of some tasks acquiring
locks at runtime and some tasks having implicit fixed lock intervals, all tasks
ask for locks explicitly. This occurs either in "isReady" (which runs on the
overlord) or in "run" (which runs on the peon).

Other changes:
- The TaskQueue is attached to the leader lifecycle, instead of global
- The TaskLockbox is able to sync itself from storage and is no longer
  bootstrapped by the TaskQueue.
- RemoteTaskRunner does not clean up zk paths until asked to. This will
  prevent deletion of statuses that have not yet been committed.
- Added retries on DbTaskStorage operations.
- Removed SpawnTasksAction (no more subtasks)
- Removed obsolete EventReceiverFirehose configs
- Removed obsolete OldOverlordResource
- Removed TaskStorageQueryAdapter methods related to subtasks
2013-12-11 15:05:16 -08:00
Gian Merlino f3cfd1d781 Introduce FileTaskLogs, and move TaskLogs module from server to indexing-service 2013-12-10 17:39:43 -08:00
fjy a7cc559623 [maven-release-plugin] prepare for next development iteration 2013-12-09 20:07:38 -08:00
fjy 54755b8864 [maven-release-plugin] prepare release druid-0.6.30 2013-12-09 20:07:34 -08:00
fjy 6cc0860657 fix s3 module problems and prepare for next release 2013-12-09 20:05:55 -08:00
fjy 7a134272b3 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:45:27 -08:00
fjy 829658f171 [maven-release-plugin] prepare release druid-0.6.29 2013-12-09 18:45:23 -08:00
fjy ab1f02b2bc fix version brokenness and prepare for next release 2013-12-09 18:38:22 -08:00
fjy 98a0f40227 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:35:22 -08:00
fjy 939d2313c0 [maven-release-plugin] prepare release druid-0.6.28 2013-12-09 18:35:18 -08:00
fjy c03d573e84 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:30:15 -08:00
fjy 71fe8a43da [maven-release-plugin] prepare release druid-0.6.27 2013-12-09 18:30:11 -08:00
fjy 976affb3af prepare for next release 2013-12-09 18:28:31 -08:00
fjy 303f6ff334 fix worker config setup problems 2013-12-09 18:25:29 -08:00
fjy 8aba4ad3d2 Merge pull request #311 from metamx/versions
Add versions to static page
2013-12-09 17:18:16 -08:00
Himadri Singh b5f6dbc32f Code refactoring, one place! 2013-12-10 02:09:41 +05:30
Himadri Singh 8117fff4e2 Some minor fixes 2013-12-10 00:39:10 +05:30
fjy 7c7cfdf819 [maven-release-plugin] prepare for next development iteration 2013-12-04 18:57:30 -08:00
fjy 6bfb3b8d41 [maven-release-plugin] prepare release druid-0.6.26 2013-12-04 18:57:25 -08:00
fjy fbad1e2d7a fix convert properties with infoPath and prepare for next release 2013-12-04 18:55:35 -08:00
Himadri Singh 32200b9b41 removing debug line. 2013-12-04 11:00:47 +05:30
Himadri Singh 47278ad109 Merge relevant changes from 'druid-version-info' 2013-12-04 10:21:19 +05:30
fjy 1a3a1221c2 [maven-release-plugin] prepare for next development iteration 2013-12-02 14:22:54 -08:00
fjy b18b65108a [maven-release-plugin] prepare release druid-0.6.25 2013-12-02 14:22:50 -08:00
fjy 05f72601c4 fix request time metric and prepare for next release 2013-12-02 14:20:59 -08:00
fjy 730e3a2303 [maven-release-plugin] prepare for next development iteration 2013-11-25 17:55:01 -08:00
fjy c7171e3311 [maven-release-plugin] prepare release druid-0.6.24 2013-11-25 17:54:57 -08:00
fjy ddb6e83f17 fix realtime default and prepare for next deploy 2013-11-25 17:53:17 -08:00
fjy 5c6e647148 [maven-release-plugin] prepare for next development iteration 2013-11-20 12:00:15 -08:00
fjy 5b94895a36 [maven-release-plugin] prepare release druid-0.6.23 2013-11-20 12:00:11 -08:00
fjy fbb65988bd make query resource eagerly instantiate and prepare for next release 2013-11-20 11:58:25 -08:00
fjy ea95566cd9 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:45:21 -08:00
fjy fe7122b717 [maven-release-plugin] prepare release druid-0.6.22 2013-11-20 10:45:17 -08:00
fjy c234dafee1 prepare for next release 2013-11-20 10:43:37 -08:00
fjy 88378eb036 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:28:57 -08:00
fjy 2e6056f537 [maven-release-plugin] prepare release druid-0.6.21 2013-11-20 10:28:52 -08:00
fjy 84a6262e04 prepare for next release 2013-11-20 10:27:09 -08:00
fjy e7167ae00a add new query resource 2013-11-20 10:02:43 -08:00
fjy 7fec5e6ff7 [maven-release-plugin] prepare for next development iteration 2013-11-19 09:59:48 -08:00
fjy 265ef23cd5 [maven-release-plugin] prepare release druid-0.6.20 2013-11-19 09:59:44 -08:00
fjy 984e24c1bb fix broken links in docs, prepare for next release 2013-11-19 09:57:56 -08:00
fjy 67a93ccd4d fix broken validation query config port 2013-11-18 15:53:49 -08:00
fjy 1820110818 clean up docs and fix server monitor double emitting metrics 2013-11-18 15:37:30 -08:00
fjy a86d3af17e fix docs 2013-11-14 18:29:27 -08:00
fjy 48d275e5cb [maven-release-plugin] prepare for next development iteration 2013-11-14 18:20:29 -08:00
fjy c31c5ce1ac [maven-release-plugin] prepare release druid-0.6.19 2013-11-14 18:20:25 -08:00
fjy 346cf0e04c fix out of order in urls for hadoop classpath 2013-11-14 18:18:39 -08:00
fjy d935e1b47b [maven-release-plugin] prepare for next development iteration 2013-11-14 15:08:12 -08:00
fjy 32dbbe4f63 [maven-release-plugin] prepare release druid-0.6.18 2013-11-14 15:08:09 -08:00
fjy 5d00e4075e prepare for next release 2013-11-14 15:06:26 -08:00
fjy 6b41681424 fix ordering of urls, ugh, need to write more tests 2013-11-14 15:06:07 -08:00
fjy 373251a476 [maven-release-plugin] prepare for next development iteration 2013-11-14 14:31:26 -08:00
fjy 7120db20a4 [maven-release-plugin] prepare release druid-0.6.17 2013-11-14 14:31:22 -08:00
fjy 23ebca6d32 more hadoop dependency hell, getting the right urls to hadoop is hard 2013-11-14 14:29:42 -08:00
fjy 89e6ce3550 [maven-release-plugin] prepare for next development iteration 2013-11-14 13:18:24 -08:00
fjy 97293b3f04 [maven-release-plugin] prepare release druid-0.6.16 2013-11-14 13:18:20 -08:00
fjy 61367c6b13 prepare for next release 2013-11-14 13:16:38 -08:00
fjy c51eed060f actually use a class loader pull out dependencies from extension modules 2013-11-14 11:52:21 -08:00
fjy e7118cd9be [maven-release-plugin] prepare for next development iteration 2013-11-14 10:54:37 -08:00
fjy d3f46c826a [maven-release-plugin] prepare release druid-0.6.15 2013-11-14 10:54:32 -08:00
fjy fcf0c6ce06 change the classpath ordering for batch processing and prepare for next release 2013-11-14 10:52:51 -08:00
fjy 60300bdad0 fix doc version 2013-11-13 13:34:57 -08:00
fjy 6e7e2428e8 [maven-release-plugin] prepare for next development iteration 2013-11-13 13:27:47 -08:00
fjy 9c4cecc015 [maven-release-plugin] prepare release druid-0.6.14 2013-11-13 13:27:43 -08:00
fjy 6c41cd8682 [maven-release-plugin] prepare for next development iteration 2013-11-13 11:38:44 -08:00
fjy b93550194a [maven-release-plugin] prepare release druid-0.6.13 2013-11-13 11:38:39 -08:00
fjy c1009f0872 prepare for next release 2013-11-13 11:36:50 -08:00
fjy d0f990129a fix docs 2013-11-13 10:59:03 -08:00
fjy 9bbaade8f9 [maven-release-plugin] prepare for next development iteration 2013-11-13 10:37:12 -08:00
fjy 4dffef698e [maven-release-plugin] prepare release druid-0.6.12 2013-11-13 10:37:08 -08:00
fjy 12a188d8d6 [maven-release-plugin] prepare for next development iteration 2013-11-12 15:20:54 -08:00
fjy 63d9f7362a [maven-release-plugin] prepare release druid-0.6.11 2013-11-12 15:20:47 -08:00
fjy 0681fb614d [maven-release-plugin] prepare for next development iteration 2013-11-08 15:56:10 -08:00
fjy de5984ccea [maven-release-plugin] prepare release druid-0.6.10 2013-11-08 15:56:06 -08:00
fjy 9fe9ca3163 the emitter library is broken and also prepare for next release 2013-11-08 15:54:16 -08:00
fjy d212b3fc43 [maven-release-plugin] prepare for next development iteration 2013-11-08 15:14:46 -08:00
fjy 4cd4578539 [maven-release-plugin] prepare release druid-0.6.9 2013-11-08 15:14:41 -08:00
fjy 822a30658d fix broken http post emitter and prepare for next release 2013-11-08 14:01:16 -08:00
fjy fd4fb78e1f [maven-release-plugin] prepare for next development iteration 2013-11-08 11:34:12 -08:00
fjy f8d5d127a4 [maven-release-plugin] prepare release druid-0.6.8 2013-11-08 11:34:09 -08:00
fjy 64b93bf448 fix broken autoscaling and prepare for next release 2013-11-08 11:29:42 -08:00
fjy 90240e6f1e [maven-release-plugin] prepare for next development iteration 2013-11-07 23:29:02 -08:00
fjy c3d6233bc4 [maven-release-plugin] prepare release druid-0.6.7 2013-11-07 23:28:58 -08:00
fjy d70bcc5657 repair broken pom 2013-11-07 23:27:06 -08:00
fjy a0eedf7342 fix broken docs 2013-11-07 23:11:30 -08:00
fjy d1c3176bf5 update docs ver 2013-11-07 19:47:36 -08:00
fjy fafd9c8d27 [maven-release-plugin] prepare for next development iteration 2013-11-07 18:20:19 -08:00
fjy f945416538 [maven-release-plugin] prepare release druid-0.6.5 2013-11-07 18:20:16 -08:00
fjy ed328aca6e [maven-release-plugin] prepare for next development iteration 2013-11-07 18:03:39 -08:00
fjy e34f1a829b [maven-release-plugin] prepare release druid-0.6.4 2013-11-07 18:03:36 -08:00
fjy a049b42674 fix an issue with task tables not getting created automatically and prepare for next release 2013-11-07 18:01:35 -08:00
fjy 009646ed56 [maven-release-plugin] prepare for next development iteration 2013-11-07 17:40:12 -08:00
fjy 4cde47c9d1 [maven-release-plugin] prepare release druid-0.6.3 2013-11-07 17:40:06 -08:00
fjy d49554185a fix broken default table names 2013-11-07 17:38:00 -08:00
fjy e6a83c0339 [maven-release-plugin] prepare for next development iteration 2013-11-07 17:05:52 -08:00
fjy 2ac09b798d [maven-release-plugin] prepare release druid-0.6.2 2013-11-07 17:05:48 -08:00
fjy 564600e343 remove extra dependency 2013-11-07 16:11:03 -08:00
fjy bdff538ed8 fix poms again 2013-11-07 16:09:01 -08:00
fjy c94455627b fix pom 2013-11-07 16:00:38 -08:00
fjy aeb411a3a3 fix according to code review and fix broken examples 2013-11-07 15:42:48 -08:00
fjy 6b573c76f1 more fixes 2013-11-07 14:40:45 -08:00
fjy ee15fd9f85 [maven-release-plugin] prepare for next development iteration 2013-11-05 15:42:37 -08:00
fjy 713015199a [maven-release-plugin] prepare release druid-0.6.1 2013-11-05 15:42:33 -08:00
fjy 33561031a2 update docs version to match next release 2013-11-05 15:30:41 -08:00
Xavier Léauté dce6e7e0eb hack to support remote repository authentication 2013-11-01 09:33:07 -07:00
Xavier Léauté ef88f37bbe add tools pull-deps to cli 2013-10-30 18:16:27 -07:00
fjy 21235ae533 fix configuration conversion bugs and docs and hdfs configs 2013-10-29 17:34:24 -04:00
fjy a684885839 [maven-release-plugin] prepare for next development iteration 2013-10-18 15:48:16 -07:00
fjy 88dcfe9a94 [maven-release-plugin] prepare release druid-0.6.0 2013-10-18 15:48:12 -07:00
Gian Merlino 2e9c46867f Fixes for indexing service.
- Create IndexingServiceFirehoseModule so firehoses can be loaded by all mains
- Fix implicit lock acquisition in AbstractTask
2013-10-18 11:14:33 -07:00
fjy a1c09df17f make the hadoop index task work again 2013-10-16 09:45:17 -07:00
fjy 9796a40b92 port docs over to 0.6 and a bunch of misc fixes 2013-10-11 18:38:53 -07:00
fjy a9a723bd11 clean up poms, add a new loading your own data tutorial, add new validation, clean up logs 2013-10-09 15:42:39 -07:00
fjy 4e509d1d09 Merge branch 'master' into is-docs 2013-10-09 14:05:10 -07:00
cheddar c47fe202c7 Fix HadoopDruidIndexer to work with the new way of things
There are multiple and sundry changes in here.

First, "HadoopDruidIndexer" has been split into two pieces, (1) CliHadoop which pulls the hadoop version and builds up the right classpath with the proper hadoop version to run the indexer and (2) CliInternalHadoopIndexer which actually runs the indexer.

In order to work around a bunch of jets3t version conflicts with Hadoop and Druid, I needed to extract the S3 deep storage stuff into its own module.  I then also moved the HDFS stuff into its own module so that I could eliminate the dependency on Hadoop for druid-server.

In doing these changes, I wanted to make the extensions buildable with only the druid-api jar, so a few other things had to move out of Druid and into druid-api.  They are all API-level things, however, so they really belong in druid-api instead.

Lastly, I removed the druid-realtime module and put it all in druid-server.
2013-10-09 15:15:44 -05:00
fjy 4ec4b8e024 rewrite indexing service docs 2013-10-08 16:34:58 -07:00
fjy ac330f72bb first set of changes to standarize the naming convention we use in druid 2013-10-03 16:36:48 -07:00
fjy bf157ea8ef fix the example assembly and have better error logging for rabbitmq 2013-10-03 10:54:25 -07:00
fjy 17874eeb67 make the CliPeon actually able to run on its own 2013-10-02 15:55:10 -07:00
fjy bc8db7daa5 1) make chat handler resource work again
2) add more default configs
3) make examples work again
2013-10-02 14:22:39 -07:00
Gian Merlino 384dcda7e4 Chat handlers still don't work, but, they're closer maybe. 2013-10-01 17:45:53 -07:00
fjy 5d0d71250b fix chat handler resources not correctly registering themselves 2013-10-01 11:25:39 -07:00
fjy d6445cd8f3 remove imports 2013-10-01 09:42:28 -07:00
fjy 53698a135a add interface to new firehose as per code review comments 2013-09-30 18:00:59 -07:00
fjy f55a5199b1 add a firehose module to remove so much copy and pasted code 2013-09-30 16:29:20 -07:00
fjy ed9e0cf9f6 add a local firehose for indexing local files 2013-09-30 16:03:26 -07:00
fjy 4a7a28a7f6 Merge branch 'master' into fix-config 2013-09-27 17:17:46 -07:00
Gian Merlino dc5dab8747 Fixes for property conversion, firehose registration, and the indexing service 2013-09-27 17:09:59 -07:00
fjy a79ad7bab4 make dynamic master resource configuration work again 2013-09-27 15:00:40 -07:00
fjy 0b04325ee8 fix things up according to code review comments 2013-09-27 10:17:45 -07:00
fjy e404295c1f make indexing service work 2013-09-26 17:44:21 -07:00
fjy 8bc56daa66 fix things up according to code review comments 2013-09-26 11:35:45 -07:00