Merge remote-tracking branch 'upstream/master' into correct-sendtxn

2021-03-04 08:39:16 -05:00 · 2021-03-04 08:39:16 -05:00 · d0df8b495c
commit d0df8b495c
parent e239014fa3 bd6507eafb
49 changed files with 747 additions and 281 deletions
--- a/src/database.rs
+++ b/src/database.rs
@ -38,6 +38,8 @@ pub struct Config {
    allow_encryption: bool,
    #[serde(default = "false_fn")]
    allow_federation: bool,
+    #[serde(default = "false_fn")]
+    pub allow_jaeger: bool,
    jwt_secret: Option<String>,
    #[serde(default = "Vec::new")]
    trusted_servers: Vec<Box<ServerName>>,