Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add support for pre-aggregated Sessions #284

Merged
merged 4 commits into from
Jan 20, 2021
Merged

feat: Add support for pre-aggregated Sessions #284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4260bbe
feat: Add support for pre-aggregated Sessions
Swatinem Oct 20, 2020
9f36fd4
Merge branch 'master' into feat/aggregates
Swatinem Jan 19, 2021
27c44bb
add a note about upstream support
Swatinem Jan 19, 2021
17a42fa
use default features for actix dev-dep
Swatinem Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into feat/aggregates
  • Loading branch information
@Swatinem
Swatinem committed Jan 19, 2021
commit 9f36fd49320e40ce9514cb77fe1f1bd53a04b034
2 changes: 1 addition & 1 deletion sentry-actix/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ actix-web = { version = "3", default-features = false }
futures-util = { version = "0.3.5", default-features = false }

[dev-dependencies]
sentry = { version = "0.21.0", path = "../sentry", features = ["test"] }
sentry = { version = "0.22.0", path = "../sentry", default-features = false, features = ["test"] }
actix-rt = "1.1.1"
futures = "0.3"
4 changes: 2 additions & 2 deletions sentry-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ debug-logs = ["log_"]
test = ["client"]

[dependencies]
sentry-types = { version = "0.21.0", path = "../sentry-types" }
chrono = "0.4.10"
sentry-types = { version = "0.22.0", path = "../sentry-types" }
serde = { version = "1.0.104", features = ["derive"] }
chrono = "0.4.10"
lazy_static = "1.4.0"
rand = { version = "0.8.1", optional = true }
serde_json = "1.0.46"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.