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

1274 Commits

Author SHA1 Message Date
Hagen Rother bfae07338c make ServerTimeRejectionPolicy also reject timestamps AHEAD of server time 2014-01-14 11:11:04 +01: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 3b17c4c03c a whole bunch of docs and fixes 2014-01-13 18:01:56 -08:00
fjy 6816de7518 Merge pull request #354 from metamx/request-peer-metric 
QueryResource: Store remote address in user7
 2014-01-10 13:39:01 -08:00
Gian Merlino 643f999605 QueryResource: Store remote address in user7 2014-01-10 13:37:13 -08:00
Xavier Léauté bd9a4a0b60 add connection count test in case of failure 2014-01-10 12:43:17 -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
fjy f3d6bdc76d fix GUI 2014-01-09 16:42:23 -08:00
Xavier Léauté ca90530085 simplify things a bit 2014-01-09 14:45:13 -08:00
Xavier Léauté 632d6b0a78 make server selection configurable, add back random server selection 2014-01-09 14:37:33 -08:00
Xavier Léauté 3d734944ef fix connection counting 2014-01-09 11:55:43 -08:00
fjy 2aabc6c4e6 Merge branch 'master' into select 
Conflicts:
	processing/src/main/java/io/druid/query/Query.java
	server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java
	server/src/main/java/io/druid/guice/QueryToolChestModule.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-01-08 16:31:19 -08:00
fjy 96caf2d518 Merge branch 'master' into az 2014-01-08 16:23:05 -08:00
fjy f8478d49d8 Merge pull request #350 from metamx/topN 
Approximate TopN Query
 2014-01-08 15:58:52 -08:00
fjy 50a6839693 inital commit of topNs 2014-01-08 15:51:03 -08:00
Gian Merlino 1476d7f51e LinearShardSpec, NumberedShardSpec toString methods 2014-01-08 15:22:12 -08:00
fjy 306f4b8fa2 more tests 2014-01-08 14:08:41 -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 98d01b1a9c Merge branch 'master' into az 2014-01-06 09:31:33 -08:00
fjy 3544b7ec4a Fixes #346 2014-01-06 09:31:04 -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
fjy 2d3c4812e5 passing tests from loading across tiers 2014-01-02 11:33:05 -08:00
fjy 488a118f3f Merge branch 'master' into az 2014-01-02 10:53:37 -08:00
fjy 2205ebf459 Merge pull request #343 from metamx/dependency-cleanup 
Dependency cleanup & Initialization tests
 2014-01-02 10:51:29 -08:00
Jae Hyeon Bae e4bcbcf3cc curator 2.3.0 2014-01-02 10:35:09 -08:00
Xavier Léauté c0e7837a58 add back guice-servlet 2014-01-02 10:18:31 -08:00
Xavier Léauté ef05312c97 cleanup dependencies 2013-12-30 16:31:12 -08:00
Xavier Léauté 95d92915bf more tests for Initialization + dependency cleanup 2013-12-30 16:31:10 -08:00
fjy 6c6c1c83f8 Merge pull request #335 from rays-qpi/postgres-support 
Remove unused payload column from sub-select that fails in postgres.  Use ...
 2013-12-23 08:25:02 -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 837dee1934 RealtimePlumberSchool: Alert and continue on any exception when abandoning segments 2013-12-20 11:38:42 -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 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 b6b9bb4cd8 Merge branch 'master' of github.com:metamx/druid into az 2013-12-19 10:52:22 -08:00
fjy fba6caf7fd Merge pull request #326 from metamx/versions 
StatusResource
 2013-12-18 22:44:50 -08:00
Himadri Singh 818aba458f Moved TestDruidModule 2013-12-19 12:14:06 +05:30
Himadri Singh cd1e7cc65d Updated test 2013-12-19 12:01:18 +05:30
Himadri Singh b1a9ecc1cf StatusResourceTest 
misses testing reloading of modules currently
 2013-12-19 11:42:22 +05:30
Himadri Singh c58fbfe40c minor fixes 2013-12-19 10:49:38 +05:30
fjy 6b9bccd796 Merge branch 'master' into az 2013-12-18 18:47:35 -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
fjy 9b8134c73e Merge branch 'master' into az 2013-12-18 15:44:43 -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
Ray Sayre c969b37bac Remove unused payload column frosub-select that fails in postgres. Use boolean true/false for 'used' column so that queries run in postres 2013-12-18 13:01:36 -08: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 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 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 27bba22e6f make rules assignable across tiers 2013-12-16 15:54:42 -08:00
fjy e309f48357 Merge branch 'master' into az 
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
 2013-12-16 14:57:54 -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
fjy b917ada54d Merge pull request #328 from metamx/coordinator-leader-discovery 
Coordinator: Link service announcement to leadership
 2013-12-16 12:01:24 -08:00
Gian Merlino 7759ed4517 Coordinator: Link service announcement to leadership 2013-12-16 11:28:28 -08:00
Gian Merlino d2451fa37b Coordinator: Stop databaseRuleManager in stopBeingLeader 2013-12-16 11:12:20 -08:00
Gian Merlino 079331493a ZkCoordinator: Make addSegment, addSegments idempotent 2013-12-16 10:56:14 -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 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 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 52cdb20f10 add better messaging and error handling 2013-12-13 15:01:07 -08:00
fjy ca7335f45f things dont work 2013-12-13 13:35:22 -08:00
Himadri Singh 65facc935d Do not load extensions on each call 2013-12-13 13:05:57 +05:30
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 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
Gian Merlino dbe93034d0 StatusResource: Remove extension versions 
They cause services to create a brand-new startup injector and reload all
modules whenever /status is requested. Not sure how bad this is, but I think
we're only supposed to have one startup injector so there may be a better
approach out there.
 2013-12-12 17:23:15 -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
Gian Merlino b2ea216bdf HttpClientModule: Default http timeout to PT5M 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 a262d8bf11 fix curator shutdown problem in curator inv manager test 2013-12-09 18:56:30 -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 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 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
fjy f17e08324d Merge branch 'master' into select 2013-12-09 11:30:35 -08:00
Himadri Singh e6b915f1e7 druid-api version not required 2013-12-10 00:05:56 +05:30
fjy d9762ac9bd fix shutdown 2013-12-06 11:17:19 -08:00
fjy 5fe0a8f2fb fix casting 2013-12-06 11:16:27 -08:00
fjy 1fcbbc8262 fix logging 2013-12-06 11:14:39 -08:00
fjy 2c5562b6ff fix wrong shard spec 2013-12-06 10:29:22 -08:00
fjy f8ff9296bc fix logs 2013-12-06 10:26:35 -08:00
fjy 767663af92 fix how flushing plumber flushes 2013-12-06 10:25:50 -08:00
fjy 932d688022 remove unneccessary merge n persist start 2013-12-06 10:15:18 -08:00
fjy 90aa9eca47 more logs 2013-12-06 09:57:07 -08:00
fjy 986223a49d more logs 2013-12-06 09:56:47 -08:00
fjy c4b990bb27 more logging 2013-12-06 09:56:23 -08:00
fjy e7b6b5c2af fix persist with flushing plumber 2013-12-06 09:51:43 -08:00
fjy 5ba05a46f6 fix nulls in realtime persist 2013-12-05 17:59:02 -08:00
fjy 6f079bcc8f fix segment id for ii 2013-12-05 17:01:55 -08:00
fjy ae5a4ff54c add versions to incremental index segment 2013-12-05 16:47:28 -08:00
fjy 60d72a0fd3 add flushing plumber 2013-12-05 16:24:54 -08:00
fjy 241c80ef24 working pagination maybe 2013-12-05 13:37:44 -08:00
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 31c7ed639d first commit 2013-12-04 13:53:08 -08:00
Himadri Singh a2c8388742 No need of druid-server.version 2013-12-04 10:21:36 +05:30
Himadri Singh 47278ad109 Merge relevant changes from 'druid-version-info' 2013-12-04 10:21:19 +05:30
fjy 929b2336a9 fix non deterministic behaviour in test 2013-12-02 17:02:24 -08:00
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
Stefán Freyr Stefánsson 2b7fcfe738 Merge remote-tracking branch 'upstream/master' into rabbitmq-module 
Conflicts:
	examples/config/realtime/runtime.properties
 2013-11-27 20:58:22 +00:00
Himadri Singh 95fafe02a7 server versions with loaded extensions versions 2013-11-27 12:21:35 +05:30
Himadri Singh abf417a1c4 version of druid-server 2013-11-26 17:47:23 +05:30
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
Stefán Freyr Stefánsson 386c81f0d9 Merge remote-tracking branch 'upstream/master' into rabbitmq-module 2013-11-25 22:44:25 +00:00
Himadri Singh 659493c4d2 Add versions to static page 2013-11-24 20:27:34 +05:30
Stefán Freyr Stefánsson 9eb4a7d9df Added commons-cli dependency. 2013-11-22 10:44:16 +00:00
Stefán Freyr Stefánsson 71598ee60e Moving RabbitMQ stuff to a module. 2013-11-21 18:41:06 +00:00
Xavier Léauté 3134affac9 fix NPE in DirectDruidClient 2013-11-20 17:15:26 -08:00
Xavier Léauté d0fe70a21f replace deprecated calls to getJsonFactory and createJsonParser 2013-11-20 17:14:23 -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 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 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 c60e75a6b4 Merge branch 'master' of github.com:metamx/druid into query-resource 2013-11-20 10:02:51 -08:00
fjy e7167ae00a add new query resource 2013-11-20 10:02:43 -08:00
Stefán Freyr Stefánsson 6aafba4393 Merge remote-tracking branch 'upstream/master' into rabbitmq-lyra 2013-11-20 16:25:53 +00:00
fjy 6bc429f38d Merge pull request #302 from metamx/more-metrics 
add total segment size/count metric
 2013-11-19 10:08:57 -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
Stefán Freyr Stefánsson f644c8ea66 Ugly quick'n'dirty way of getting lyra to work. 2013-11-19 10:18:00 +00:00
Xavier Léauté 1e9d72d95a add total segment size/count metric 2013-11-18 13:51:06 -08:00
fjy f66fe3cbbb another better default 2013-11-18 13:16:47 -08:00
fjy c5361cc100 fix serde problem in CCC and better defaults for jetty threads 2013-11-18 13:14:18 -08:00
fjy 60dbdcebac we need to explicitly set the connector thread pool based on the default number of threads in our config to accomodate how jetty 8 works 2013-11-16 11:09:42 -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 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 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 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 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 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 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 51aa7a2284 doesnt work yet 2013-11-11 14:04:03 -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 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 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 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 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 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
Xavier Léauté 1c87a00713 remove servlet-api deps, duplicates jetty dependency 2013-11-07 16:34:50 -08:00
Xavier Léauté 4fe52320d7 remove duplicate dependencies 2013-11-07 16:13:38 -08:00
fjy 6181114acd Merge pull request #288 from metamx/abandon-rt-segments 
Realtime: Abandon segments that fail to push when shutting down
 2013-11-07 15:53:49 -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
Xavier Léauté 76732c25f8 increase timeout for slow machines and provide more descriptive error message 2013-11-04 14:07:43 -08:00