Skip to content

Commit

Permalink
Merge branch 'master' into pace
Browse files Browse the repository at this point in the history
  • Loading branch information
bojand committed Nov 4, 2020
2 parents c31b957 + dc6b53f commit a8d9ac7
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 43 deletions.
4 changes: 3 additions & 1 deletion .chglog/CHANGELOG.tpl.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
{{ range .Commits -}}
- {{.Hash.Short}} {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ if .Subject }}{{ .Subject }}{{ else }}{{ .Header }}{{ end }}
{{ end }}
{{ end }}
{{ end -}}

### Commits
{{ range .Commits -}}
- {{.Hash.Short}} {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ if .Subject }}{{ .Subject }}{{ else }}{{ .Header }}{{ end }}
{{ end }}
{{ end -}}

{{- if .NoteGroups -}}
{{ range .NoteGroups -}}
Expand All @@ -24,4 +25,5 @@
{{ end }}
{{ end -}}
{{ end -}}

{{ end -}}
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
run: git fetch --prune --unshallow

- name: Set version
run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//}
run: echo "RELEASE_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV

# These can be squashed when https://github.com/actions/download-artifact/issues/6 is closed
- name: Download releases from github_build
Expand Down
30 changes: 15 additions & 15 deletions testdata/localhost.crt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
MIIC8DCCAdigAwIBAgIUEaTRfYj+NdrQpNaQ2KBsmWfTnHAwDQYJKoZIhvcNAQEL
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIwMTAwMTAxMDIzOFoXDTIwMTAz
MTAxMDIzOFowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAol0A7eChQ3Q6a1KGtMImxwaJPWxrhieWP29WV7Cow/OD
4Wh8v19V4DYBWeCKT2zm4GyfzOLuGoyArL5eBMd7phpxV2M59HwKfLlzb/RccI8+
/Tx5OiohleWX5wxVctGJnC1kBnaVxdlS0a4NI5cZdefJw0PJFFsWrN6nwXzcFpbi
DucENhxiix1BG7Uk9luiC1Qb0Qn8wMaA0g1hiYXGKGTAOp3AaWxFpYoeiRLr0dTb
DYdySB5f+Z9Kcc8Vjrso7xEoVMtC0BdAtJiimAgd00vjuUi0Pw6IbRvrgLF7dEHN
+4MmftIqqan61C+QLGobAPSpCeiQz76Cb9TWgwrijwIDAQABozowODAUBgNVHREE
MIIC8DCCAdigAwIBAgIUTOrNRu0MfJDKJr9XC37MxInz4EwwDQYJKoZIhvcNAQEL
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIwMTEwMTAwNDY0MFoXDTIwMTIw
MTAwNDY0MFowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAuV0hI1daQPkm29d31rHDvEamRzRsrrNXTHyNuvPJ29n1
c3NYIBI8lKxFMmc6wWPpVieqMFk6Zi5hQkbWMFLd/2twtO3ekVtPewP5Gn6UkjsX
FU9gp8ZlVHDLA6IDXgxW7H4owt1Qfr48n66+AzLxL2YlmA0DdwPa5Z1T9NEGlOvh
q8QWqOQsoQUFCYF7mNO1uZBA4rOooJZRwXgqa8xnCSiKE6tJoyu/e7RBFtN/vMG9
8TFxnV1bZjtT9V6nWLAYcikLwWVfpukuxD2oVSv+JWfD/Hy85UspE2fDx7pgXCUK
krYIMBNoN4z6D18dymzfQMbaXz/A3kEo1L9idDZSOQIDAQABozowODAUBgNVHREE
DTALgglsb2NhbGhvc3QwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMB
MA0GCSqGSIb3DQEBCwUAA4IBAQBWGqOxGLcYhuSL3KLFxwqHuoU1WcxSa5I1dCUu
nJvqxvCwYySbtn0wabSRkPjppa/Skn4sGya4AKncGcWBdtxP2G0o45as1oyFryhZ
kmkXNDi7z5TWlbaFF7wSAGJu/OFf4E8eoJuxYbtY0jE0tIGn8TqkH2blF6VW0Xw5
zcSRfDUk5BBhE/nlUMFeRGTr+sqqCTgU2h+HWBWrgnm9jeizXYJST6Ci5Lju4g3W
wMbqW/Yk93k9n13prWXqe1bp3VdXfy7DnwnqqUtAnB1tinAFHwgFmjwJUU/cMWRE
iCDDoMhhIjhCP835FEVERH/l0iaYCEH864yq69citHRlKLlm
MA0GCSqGSIb3DQEBCwUAA4IBAQBSBNC+0K/U6fDRT6XbUoyMjgrc3/M/hEVVtBws
3o+Yp9z52DLzpqy3MAqSMGzukxpU8ybN4soijPx0xMUhnw81itnhGkdaGICnTFIE
PV0lUXXdzR1u04fKLNe9XX3lNyhFFxtl4h++08rWEcSHb2wqazLMpLR4Sz8PovKA
EvqZN1NWFHY1OfkaEXsn+5oajzgq5Mr6P8JEMLFlUpOuHYVRBNzrjRDbE7sWGTPg
4zXHa1SF/PtV7zB+hdCXyQ6cm2EfZSH3kBjYchga/1Q18LW4cbNoPt7ydGbrwjVo
18d19/w8iZLdSPcM6Tj8UcW1qt3LIh5OYBlYvYjiCoHRVZcK
-----END CERTIFICATE-----
52 changes: 26 additions & 26 deletions testdata/localhost.key
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCiXQDt4KFDdDpr
Uoa0wibHBok9bGuGJ5Y/b1ZXsKjD84PhaHy/X1XgNgFZ4IpPbObgbJ/M4u4ajICs
vl4Ex3umGnFXYzn0fAp8uXNv9Fxwjz79PHk6KiGV5ZfnDFVy0YmcLWQGdpXF2VLR
rg0jlxl158nDQ8kUWxas3qfBfNwWluIO5wQ2HGKLHUEbtST2W6ILVBvRCfzAxoDS
DWGJhcYoZMA6ncBpbEWlih6JEuvR1NsNh3JIHl/5n0pxzxWOuyjvEShUy0LQF0C0
mKKYCB3TS+O5SLQ/DohtG+uAsXt0Qc37gyZ+0iqpqfrUL5AsahsA9KkJ6JDPvoJv
1NaDCuKPAgMBAAECggEAf5j3kfpmwcwl3RIOKyApuV+5mzwJhHS370JgaKm898H4
crzazMrvgjTu+uMrzx+WkejL7QiqdtLUjO1OlhLvaap+SF8CvNB+rWZRAjrYKt1o
czuDSeKyYkr9Beb7gDCMJODHKw0mx0XzgDV4ve+RYse2GG69J/It781LqROnI1hP
8pCPCe095Q7nM5rfumtr0V664dvVawjUxEa+qYkFNY4SKXM09DZ9cr8KeuFMqyKc
2of2dmO+8n/uQJ344Kcm+/X6sSt6H01Ey/uHCLPBjrKTM/Zjn5oOBx/uv6zFGGTE
Fppjt+gHNM2a4znbeXz+hmDKmuaWs5B99Z4A2bglAQKBgQDPPnPf17XKYheczf83
8R/K438moPwHDCl+nm+kPaP/PAks9LuWGLdd5GDr5+3BCGrJhYun9p91U0k+7t/D
0401PEG3mjPbROPxUxGoABDb18ugZ5DtAZaT8nURCubWA27VFp/Q20PKGMUhveDI
GX/pGJRzZIxQw5JCbDYc66mcKQKBgQDIj411MkgETn7cW7J9Vkv0HqI81t7X2TRu
NvqIpcop3Om7jmLZZgryNM/SgrT+01vfcV+sGyCmTegiQPIOOAm6lQCijqlSVfWn
2XQdpPRsW8nlcaPwKsqEQm+NZk5SEeX/MyakrZkJ0SDknVKGmxqWagJw/r5hKQF0
3qjfVCJf9wKBgQDEmY9dKwo2yqVxyG2zyReK5hPqNk+/88atammoWh1odLCTqDsI
IbxZ4twbDvMZ6v063Whl12zf5TmX7Q3zfI35kYcaQLuu6ASBG3elcyKLG4T9TyJJ
4/bPtPNfToM7RRhwJz1G6aq+Xo8r+i/yQ1Z3byzs5tbBizYFsxgGiX1mOQKBgQCP
DJTAupRTPgmN8nlknGCgRhlBe6CGJA4Zbm1TeaywHzk25V/r37R+/NweMcwW1Xn5
7Utn3hFzjK29gMUlDyMhSZWiXE64w0br6VXArx8HCpD+bgeYDW1U2G3oVMgYEVwS
odE2M/ur3NWxOeTazVYxYntLTOdNNYosaYPZhpDeEQKBgQCQOHGr0PsG1g+ULWRL
lbR3BRy9yWVC5P3ICIApMgjMr0ghMgPl47d5jjvdoAlmdRQ7twL3uwY7bTeUKTA1
TebDR7KkMPhBEWvB4dp9Q4BdWjCaFVRMKNzSMXbVMBXiwpAXAqgquF+CHzTje7lI
yXXKZoUYjlG58AfZJpF/lyQfyA==
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5XSEjV1pA+Sbb
13fWscO8RqZHNGyus1dMfI2688nb2fVzc1ggEjyUrEUyZzrBY+lWJ6owWTpmLmFC
RtYwUt3/a3C07d6RW097A/kafpSSOxcVT2CnxmVUcMsDogNeDFbsfijC3VB+vjyf
rr4DMvEvZiWYDQN3A9rlnVP00QaU6+GrxBao5CyhBQUJgXuY07W5kEDis6igllHB
eCprzGcJKIoTq0mjK797tEEW03+8wb3xMXGdXVtmO1P1XqdYsBhyKQvBZV+m6S7E
PahVK/4lZ8P8fLzlSykTZ8PHumBcJQqStggwE2g3jPoPXx3KbN9AxtpfP8DeQSjU
v2J0NlI5AgMBAAECggEAZJvCp7760rcouzwY5GO53I/wIke3EZ9vq6kS+Dzn/Dcx
/QbG9ylOzlcue6wB/QNwm32N5w4XH2zfBy0RhksECWVUWC+flP+dhSRj6Vh45WHD
JqLd0FJjn1BVMFSYRUynRVc4YoPi89fnabhbk7rro5FqqDuv/MIP5n7dGcz2KI9t
yzNWIteFX1zqaAycKJhUHgjINvjfZYZIXro+eXir+XPOxMWb+nRKMmW0/E7d3F90
cP6uivFSYJ4bb8Jwl+mmFq6Z5r1iO5w4QRh72cl8N6T6yAnfopbrLy96CKm2vaBg
c7ddYt7qTHLNWcVQ+b5YJx12ON2QATY2YOG0msc+HQKBgQDrnwCOu+DCjsqMyZwC
WyQW0Okurl7o11JnGqUwbs+Y1OmqxAR1iWEwVquqISuuyz4326lrQ4DLU6QSOU+U
CKF0WYWEResCMKTirPfyUK9swlsaXv0FlN9N1NfdcGsdTA57iXC9Ir3Hel86KpNb
/TNKuz1eyKuhCCuHoLBWPCg1fwKBgQDJZVs7P8IdlWsLB7P8hIV2qUjtUKSWsG5i
2LkLcyxsiqcf5/at/FNH2sxp80KRwM2UuCTRuRWaV86Qef/qkZU+ft9jfQJFY3Nu
N1nE4mKovWXJG853c/SbGQ/HiZTjiUoyHAjESB+ivonHB2ag3kspsfOkNHrFTRyt
quv3d4aERwKBgCRRsA5QW4bh58rn0Mp0Lg3uSeNOMYcGmccWzlu22P0f5JzT9jP/
5yFCWtewoUEiRwbpLyY/k3zD+chtWRzib7C1k+UduenugZwHOXj6gu/qzYw1FB9m
IT2oD1Ys2/X6IUldmCkvT72N2Vvn8Cr/zoY4cm9H01zRG5SealAAmdoVAoGABllN
oPaHlgspzrU1dVZwJqd7hw+twJpbQH54huXglqNgVV8opZ94uKErJIPoq1Oap3+O
mZXuGml+N4vBB5IDVG8Hd8lvEuTptKXGDLDeT1d5J/facGWVZnZJyw6JRQsE7cN4
e0eSx7yd90pCb/vR/sR/W8PTwviFWOw0eB6qfO0CgYEA62EOIXmhFcCVgO/G4tw8
fDhbnsZc6Z8TtIOdyoOuzN6caam7Mo/snumlqk/sJaSTGyy7K4amZxyH0HhQCOcX
s6Bu24xQol28tdxG5PpekfMEiDakRAdidy/YXfKwvN5jsMnMWgi+tdV705Dkdy9Q
NmhAre8lllX/OVAhzDx8hJg=
-----END PRIVATE KEY-----

0 comments on commit a8d9ac7

Please sign in to comment.