Merge branch 'master' into release-0.29.0

metabase · May 1, 2018 · ff2120a · ff2120a
2 parents 89908ff + 73c7278
commit ff2120a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/frontend/src/metabase/setup/containers/PostSetupApp.jsx b/frontend/src/metabase/setup/containers/PostSetupApp.jsx
@@ -15,7 +15,9 @@ import cx from "classnames";
 import { t } from "c-3po";
 
 const CANDIDATES_POLL_INTERVAL = 2000;
-const CANDIDATES_TIMEOUT = 10000;
+// ensure this is 1 second offset from CANDIDATES_POLL_INTERVAL due to
+// concurrency issue in candidates endpoint
+const CANDIDATES_TIMEOUT = 11000;
 
 const QUOTES = [
   t`Metabot is admiring your integers…`,