Closed Bug 1398965 Opened 3 years ago Closed 3 years ago

Fold memory/mozjemalloc into memory/build

Categories

(Core :: Memory Allocator, enhancement)

enhancement
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla57
Tracking Status
firefox57 --- fixed

People

(Reporter: glandium, Assigned: glandium)

References

Details

Attachments

(2 files)

No description provided.
Depends on: 1396723
Comment on attachment 8906827 [details]
Bug 1398965 - Remove MOZ_JEMALLOC_IMPL in favor of MOZ_MEMORY_IMPL.

https://reviewboard.mozilla.org/r/178544/#review183588
Attachment #8906827 - Flags: review?(n.nethercote) → review+
Comment on attachment 8906828 [details]
Bug 1398965 - Fold memory/mozjemalloc into memory/build.

https://reviewboard.mozilla.org/r/178546/#review183594
Attachment #8906828 - Flags: review?(n.nethercote) → review+
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 9e1a2ae652e1 -d 114d87a3943b: rebasing 419323:9e1a2ae652e1 "Bug 1398965 - Remove MOZ_JEMALLOC_IMPL in favor of MOZ_MEMORY_IMPL. r=njn"
merging memory/mozjemalloc/moz.build
rebasing 419324:cda392397efa "Bug 1398965 - Fold memory/mozjemalloc into memory/build. r=njn" (tip)
local [dest] changed memory/mozjemalloc/moz.build which other [source] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
Pushed by mh@glandium.org:
https://hg.mozilla.org/integration/autoland/rev/7da983d68889
Remove MOZ_JEMALLOC_IMPL in favor of MOZ_MEMORY_IMPL. r=njn
https://hg.mozilla.org/integration/autoland/rev/77650b2c2812
Fold memory/mozjemalloc into memory/build. r=njn
https://hg.mozilla.org/mozilla-central/rev/7da983d68889
https://hg.mozilla.org/mozilla-central/rev/77650b2c2812
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla57
You need to log in before you can comment on or make changes to this bug.