Merge pull request #1557 from h2database/conc_update_timeout

increase lock timeout to TestConcurrentUpdate due to Travis failures

h2/src/test/org/h2/test/synth/TestConcurrentUpdate.java

@@ -45,7 +45,7 @@ public class TestConcurrentUpdate extends TestDb {
     @Override
     public void test() throws Exception {
         deleteDb("concurrent");
-        final String url = getURL("concurrent", true);
+        final String url = getURL("concurrent;LOCK_TIMEOUT=2000", true);
         try (Connection conn = getConnection(url)) {
             Statement stat = conn.createStatement();
             stat.execute("create table test(id int primary key, name varchar)");