Merge lp:~mmcm/akiban-server/query-timeout-turbo into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Reset services after QueryTimeoutIT.

Otherwise the timeout remains in effect for later ITs, which might take more than 3s to do something on a slower machine.

[Nathan Williams (nwilliams)]

Zoom, zoom.

review: Approve

=== modified file 'src/test/java/com/akiban/server/test/it/qp/QueryTimeoutIT.java'
--- src/test/java/com/akiban/server/test/it/qp/QueryTimeoutIT.java	2013-07-09 22:54:31 +0000
+++ src/test/java/com/akiban/server/test/it/qp/QueryTimeoutIT.java	2013-07-26 21:28:25 +0000
@@ -39,6 +39,11 @@
 public class QueryTimeoutIT extends OperatorITBase
 {
     @Override
+    protected Map<String, String> startupConfigProperties() {
+        return uniqueStartupConfigProperties(getClass());
+    }
+
+    @Override
     protected void setupPostCreateSchema()
     {
         super.setupPostCreateSchema();