Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: e76705a0e90f3a73d53079f6497cb7e0c5c1654f https://github.com/hawkular/hawkular-metrics/commit/e76705a0e90f3a73d5307... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M .travis.yml M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/VirtualClockHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/VirtualClockHandler.java M rest-tests/pom.xml M tests/rest-integration-tests-jaxrs-1.1/pom.xml Log Message: ----------- make the time we block for a terminal event in REST API tests configurable Some REST API tests have been periodically failing on travis builds because of the timeout value for TestSubscriber.awaitTerminalEvent() being too low in VirtualClockHandler. This commit makes it configurable via a system property and increases the timeout for travis builds to 25 seconds. Commit: e691492fe7f856672b410e2110afed6d25ba3be1 https://github.com/hawkular/hawkular-metrics/commit/e691492fe7f856672b410... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M .travis.yml M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/VirtualClockHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/VirtualClockHandler.java M rest-tests/pom.xml M tests/rest-integration-tests-jaxrs-1.1/pom.xml Log Message: ----------- Merge pull request #315 from jsanda/terminal-event-timeout make terminal event timeout in REST API tests configurable Compare: https://github.com/hawkular/hawkular-metrics/compare/b05b1257631f...e6914...