# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1380101238 -14400
# Node ID 7d0d70557b482ff21db083848607fc2477a18b5f
# Parent  60425d39da84a695c79cd34f3f646ecba36e55b1# Parent  73425136baebdc7050215d9ccc6e6ca9a9d05971
Merge branch Gaya-8.0.x

diff -r 60425d39da84 -r 7d0d70557b48 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResultTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResultTest.java	Tue Sep 17 20:13:35 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResultTest.java	Wed Sep 25 13:27:18 2013 +0400
@@ -166,7 +166,7 @@
       StreamGobbler gobbler = new StreamGobbler(new ByteArrayInputStream(str.getBytes()));
       gobbler.start();
       try {
-        Thread.sleep(10);//wait for gobbler to read string
+        Thread.sleep(20);//wait for gobbler to read string
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();
       }