Merge branch 'develop'

holochain · Feb 7, 2024 · 0a4601c · 0a4601c
2 parents cb39412 + f827e44
commit 0a4601c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/crates/holochain_manager/src/holochain_manager.rs b/crates/holochain_manager/src/holochain_manager.rs
@@ -6,7 +6,7 @@ use std::{fs, time::Duration};
 
 // NEW_VERSION change holochain_types version
 use holochain_client::{AdminWebsocket, AgentPubKey, AppInfo, InstallAppPayload};
-use holochain_types_0_2_4::prelude::{
+use holochain_types_0_2_6::prelude::{
   AppBundleSource, CellId, CloneCellId, DisableCloneCellPayload,
 };
 use lair_keystore_manager::utils::create_dir_if_necessary;

diff --git a/crates/holochain_manager/src/versions/v0_2_6.rs b/crates/holochain_manager/src/versions/v0_2_6.rs
@@ -68,6 +68,7 @@ impl VersionManager for HolochainV0_2_6 {
       network: Some(network_config),
       db_sync_strategy: Default::default(),
       tracing_override: None,
+      tracing_scope: None,
     };
 
     serde_yaml::to_string(&config).expect("Could not convert conductor config to string")