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

Jump to bottom

Add license to tracking-allocator and add staging-prefix #2261

Merged
merged 10 commits into from
Nov 9, 2023
Merged

Add license to tracking-allocator and add staging-prefix #2261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
96a0be3
Add license to tracking-allocator
Morganamilo Nov 9, 2023
b95dae7
Rename tracking-allocator to staging
Morganamilo Nov 9, 2023
d36a572
Merge branch 'master' into morganamilo/ta-license
Morganamilo Nov 9, 2023
8588143
Trigger CI
Morganamilo Nov 9, 2023
4661989
Merge branch 'master' into morganamilo/ta-license
Morganamilo Nov 9, 2023
a721ee8
CI fix attempt
Morganamilo Nov 9, 2023
a09f2fa
CI fix attempt
Morganamilo Nov 9, 2023
fb2b8e5
Revert "CI fix attempt"
Morganamilo Nov 9, 2023
c354f97
Revert "CI fix attempt"
Morganamilo Nov 9, 2023
a9d2084
Merge branch 'master' into morganamilo/ta-license
Morganamilo Nov 9, 2023
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
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion polkadot/node/core/pvf/prepare-worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cfg-if = "1.0"
gum = { package = "tracing-gum", path = "../../../gum" }
libc = "0.2.139"
rayon = "1.5.1"
tracking-allocator = { path = "../../../tracking-allocator" }
tracking-allocator = { package = "staging-tracking-allocator", path = "../../../tracking-allocator" }
tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
tikv-jemallocator = { version = "0.5.0", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/tracking-allocator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "tracking-allocator"
name = "staging-tracking-allocator"
description = "Tracking allocator to control the amount of memory consumed by the process"
version = "1.0.0"
authors.workspace = true
Expand Down