~raof/conduit-snap/+git/trunk:complement-integration

Last commit made on 2022-03-26
Get this branch:
git clone -b complement-integration https://git.launchpad.net/~raof/conduit-snap/+git/trunk

Branch merges

Branch information

Name:
complement-integration
Repository:
lp:~raof/conduit-snap/+git/trunk

Recent commits

0552a56... by Jonas Zohren <email address hidden>

Try running complement on special CI host

b455e40... by Jonas Zohren <email address hidden>

WIP Fixes to test with complement

6be5e83... by =?utf-8?q?Timo_K=C3=B6sters?= <email address hidden>

Merge branch 'reqwest-tls-native-roots' into 'next'

Use native root CA certificates for reqwest

See merge request famedly/conduit!329

c70c012... by =?utf-8?q?Timo_K=C3=B6sters?= <email address hidden>

Merge branch 'proxy-config-examples' into 'next'

Fix proxy config examples in config/proxy.rs

See merge request famedly/conduit!321

194a85d... by Andrej Kacian

Use native root CA certificates for reqwest

738f5e8... by Jonas Zohren <email address hidden>

Merge branch 'ci-fix-cross-musl-builds' into 'next'

CI: Fix musl builds

See merge request famedly/conduit!328

5a9462c... by Jonas Zohren <email address hidden>

fix(ci): Fix musl builds

This pins the image to use for cross to a working image's sha256

36a6d72... by Jonas Zohren <email address hidden>

Merge branch 'writable' into 'next'

Fix permissions

See merge request famedly/conduit!317

65fa4b2... by Andrej Kacian

Fix proxy config examples in config/proxy.rs

6788225... by Jonas Zohren <email address hidden>

Merge branch 'fix-docker-db-dir-permissions' into 'next'

Fix(docker): Make conduit own default db path

See merge request famedly/conduit!320