diff options
| author | Joshua Hesketh <josh@nitrotech.org> | 2017-03-06 12:50:04 +1100 |
|---|---|---|
| committer | James E. Blair <jeblair@redhat.com> | 2017-03-06 09:40:04 -0800 |
| commit | 25695cbb51e84d7fe5f19f60ce521f72b74ac3eb (patch) | |
| tree | 34c44581558120ecb6f5ac2d5c43d20c2fa10e75 /etc | |
| parent | e53250c80d8959dcbe63780f05558b451fa88ca1 (diff) | |
| parent | 4da3416c3ea9d8281f3340213cb9bb4a76329ac9 (diff) | |
| download | zuul-25695cbb51e84d7fe5f19f60ce521f72b74ac3eb.tar.gz | |
Merge branch 'master' into feature/zuulv3
Change-Id: I37a3c5d4f12917b111b7eb624f8b68689687ebc4
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/status/public_html/jquery.zuul.js | 6 | ||||
| -rw-r--r-- | etc/zuul.conf-sample | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/etc/status/public_html/jquery.zuul.js b/etc/status/public_html/jquery.zuul.js index 9df44cee7..d973948be 100644 --- a/etc/status/public_html/jquery.zuul.js +++ b/etc/status/public_html/jquery.zuul.js @@ -148,11 +148,9 @@ case 'skipped': $status.addClass('label-info'); break; - case 'in progress': - case 'queued': - case 'lost': + // 'in progress' 'queued' 'lost' 'aborted' ... + default: $status.addClass('label-default'); - break; } $status.text(result); return $status; diff --git a/etc/zuul.conf-sample b/etc/zuul.conf-sample index 3de145aff..7207c7395 100644 --- a/etc/zuul.conf-sample +++ b/etc/zuul.conf-sample @@ -37,6 +37,7 @@ server=review.example.com ;baseurl=https://review.example.com/r user=jenkins sshkey=/home/jenkins/.ssh/id_rsa +;keepalive=60 [connection smtp] driver=smtp @@ -44,3 +45,7 @@ server=localhost port=25 default_from=zuul@example.com default_to=you@example.com + +[connection mydatabase] +driver=sql +dburi=mysql+pymysql://user@localhost/zuul |