Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for paritytech/substrate#12795 #6374

Merged
merged 14 commits into from
Dec 6, 2022
Merged

Companion for paritytech/substrate#12795 #6374

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
224206f
Begin removing `parity-util-mem`; remove `collect_memory_stats`
mrcnski Nov 28, 2022
f988a0b
Merge branch 'master' into m-cat/remove-parity-util-mem
mrcnski Nov 29, 2022
cafa73f
Update some dependencies that were using `parity-util-mem`
mrcnski Dec 1, 2022
7f06ad3
Remove `trie-memory-tracker` feature
mrcnski Dec 1, 2022
aa14b0b
Merge branch 'master' into m-cat/remove-parity-util-mem
mrcnski Dec 1, 2022
fa00f58
Update Cargo.lock
mrcnski Dec 1, 2022
323a858
Update `kvdb-shared-tests`
mrcnski Dec 1, 2022
0b17abc
Add back jemalloc
mrcnski Dec 1, 2022
85c14be
Add missing license header
mrcnski Dec 5, 2022
fa9bbc0
Merge branch 'master' into m-cat/remove-parity-util-mem
mrcnski Dec 5, 2022
b10c824
Merge remote-tracking branch 'origin/master' into m-cat/remove-parity…
Dec 6, 2022
b6bc360
Merge remote-tracking branch 'origin/master' into m-cat/remove-parity…
Dec 6, 2022
ed1074f
update lockfile for {"substrate"}
Dec 6, 2022
ce08e73
Merge branch 'master' into m-cat/remove-parity-util-mem
ordian Dec 6, 2022
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
Merge branch 'master' into m-cat/remove-parity-util-mem 
* master:
  Bump (#6404)
  • Loading branch information
@ordian
ordian committed Dec 6, 2022
commit ce08e73cef01e5e37ac958f92c6719cb98514004

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.