Skip to content

Commit

Permalink
Merge branch 'main' into user/jshih/device-usage
Browse files Browse the repository at this point in the history
  • Loading branch information
johnsonshih committed Jul 26, 2023
2 parents b4f259e + 46ed7d3 commit f75f457
Show file tree
Hide file tree
Showing 54 changed files with 1,915 additions and 228 deletions.
53 changes: 18 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion agent/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "agent"
version = "0.10.16"
version = "0.11.4"
authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
edition = "2018"
rust-version = "1.68.1"
Expand Down
2 changes: 1 addition & 1 deletion agent/src/util/config_action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use std::{
};
use tokio::sync::{broadcast, mpsc, RwLock};

type ConfigId = (String, String);
pub type ConfigId = (String, String);
type ConfigMap = Arc<RwLock<HashMap<ConfigId, ConfigInfo>>>;

/// Information for managing a Configuration, such as all applied Instances of that Configuration
Expand Down
Loading

0 comments on commit f75f457

Please sign in to comment.