Merge lp:~hloeung/ubuntu-repository-cache/fix-jinja-template-parsing-errors into lp:ubuntu-repository-cache

Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 340
Merged at revision: 340
Proposed branch: lp:~hloeung/ubuntu-repository-cache/fix-jinja-template-parsing-errors
Merge into: lp:ubuntu-repository-cache
Diff against target: 12 lines (+1/-1)
1 file modified
templates/squid-deb-proxy/squid-deb-proxy.conf (+1/-1)
To merge this branch: bzr merge lp:~hloeung/ubuntu-repository-cache/fix-jinja-template-parsing-errors
Reviewer Review Type Date Requested Status
Paul Collins lgtm Approve
Canonical IS Reviewers Pending
Review via email:

Commit message

Fix error with jinja template parsing, raw for braces

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Paul Collins (pjdc) :
review: Approve (lgtm)
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 340

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/squid-deb-proxy/squid-deb-proxy.conf'
2--- templates/squid-deb-proxy/squid-deb-proxy.conf 2021-06-08 01:40:54 +0000
3+++ templates/squid-deb-proxy/squid-deb-proxy.conf 2021-06-08 03:25:44 +0000
4@@ -47,7 +47,7 @@
6 # use different logs
7 cache_log /var/log/squid-deb-proxy/cache.log
8-logformat custom-squid %tg{%F %H:%M:%S} %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
9+logformat custom-squid %tg{% raw %}{%F %H:%M:%S}{% endraw %} %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
10 access_log daemon:/var/log/squid-deb-proxy/access.log custom-squid
12 # tweaks to speed things up


People subscribed via source and target branches