commit | ea2742003b40e8b22e7a06651cf3f49f24bd5118 | [log] [tgz] |
---|---|---|
author | Jenkins <jenkins@localhost> | Tue May 02 09:39:44 2017 +0000 |
committer | Jenkins <jenkins@localhost> | Tue May 02 09:39:44 2017 +0000 |
tree | c1563eda95d9f4ed6188fe55338186cbc6e691db | |
parent | 6d4c51af46be798d2784d70f89ca275f91735391 [diff] | |
parent | 6f44156b7d5c5935f1848188e5c1caf2100029e5 [diff] |
Merge remote-tracking branch 'target/master'
diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml index 98222fc..48466ef 100644 --- a/docker/swarm/stack/gerrit.yml +++ b/docker/swarm/stack/gerrit.yml
@@ -50,6 +50,7 @@ MYSQL_PASSWORD: ${_param:mysql_gerrit_password} MYSQL_DATABASE: gerrit MYSQL_ROOT_PASSWORD: ${_param:mysql_admin_password} + MYSQL_START_TIMEOUT: 300 deploy: restart_policy: condition: any