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

Merge 3.2 to edge #738

Merged
merged 475 commits into from
Oct 22, 2024
Merged

Merge 3.2 to edge #738

merged 475 commits into from
Oct 22, 2024

Conversation

pkova
Copy link
Collaborator

@pkova pkova commented Oct 21, 2024

Note that this is unlikely to contain everything that 3.2 will have, but it does contain the big ones like lagoon and directed messaging support and I want to start testing all of this stuff with 411.

pkova and others added 30 commits July 9, 2024 11:07
@pkova
mesa: wip tranceiver stuff
9d00bed
@belisarius222
mesa: more route switching cleanup
a7d8cca
@belisarius222
mesa: more incremental routing cleanup; still needs next hop in pages
2c4f585
@belisarius222
mesa: WIP refactoring, separating PIT and cache; compiles but not sane
852a1fb
@midden-fabler
http: consolidate slicing & content-range logic
695d368
@pkova
mesa: working jumbo frames
d7af826
@pkova
Double boot protection (#657)
85ae9b3 
Resolves urbit/urbit#7013
@belisarius222
mesa: actually compiles, still not sane
402593d
@belisarius222 @lukechampine
untested merge of yu/mesa with jumbo frames
214481a 
Co-authored-by: Luke Champine <lukechampine@users.noreply.github.com>
@belisarius222
mesa: compiles again, but merge still needs work
fd6297a
@lukechampine
lss: fix proof handling in non-inline case
33fef3a
@lukechampine
lss: return ready pairs from transceive
2799bdb
@lukechampine
lss: document API
b316ac9
@lukechampine
mesa: use fixed-size queue for mis_u
afd4fec
@pkova
Merge develop to next/kelvin/410 (#673)
699e6bf 
Resolves #
@tinnus-napbus
mass: return memory report to arvo
11439eb
@midden-fabler
http: cleanup ranges, content range header
a6a4d09
@midden-fabler
http: cleanup slice_mime
485f75c
@midden-fabler
http: slice_mime lth not lte
3698ec7
@pkova
Merge branch 'develop' into yu/mesa
a3087a4
@pkova
Merge branch 'develop' into yu/mesa
13762b8
@pkova
Merge branch 'yu/mesa' into mesa-switch
1af9661
@midden-fabler
http: fix headers: working
5f92f25
@belisarius222
mesa: WIP redesigning PIT
7eb6cba
@belisarius222
mesa: merge unfinished PIT refactoring
84e00f7
@matthew-levan
mass: quac cleanup
717bae5
@midden-fabler
http: cleanup wip
89b7f30
@tinnus-napbus
mass: improvements (#677)
c192a7f 
Posting a bit of cleanup here rather than just submitting comments on
the PR.
@lukechampine
mesa: handle inline proofs in _mesa_send_jumbo_pieces
627fc6c
@lukechampine
mesa: register our interest in _mesa_request_next_fragments
dd547c7
pkova and others added 24 commits September 30, 2024 16:30
@pkova
mesa: call uv_close on the resend timer
6425d35
@pkova
mesa: overlapping ranges need memmove
2d5c1a5
@pkova
mesa: freeing but not closing a libuv handle causes loom corruption
f7b55a5
@pkova
mesa: do not leak pict
06562f7
@pkova
mesa: fix very many memory leaks
5290e9b
@ripperi
Merge remote-tracking branch 'origin/develop' into mesa-pairs
b52c8aa
@ripperi
ext: upgrade urcrypt and include monocypher
97c40bc
@ripperi
mesa: fix pkg includes
da7fc1c
@ripperi
crc: fix incompitable pointer type
494f136
@ripperi
mesa: initialize var before usage
98a4a0e
@ripperi
mesa: use correct format specifiers on linux
53434c5
@ripperi
build: update build for mesa-pairs
2a01589
@yosoyubik
mesa: remove dereference of null pointer
ee7567b
@yosoyubik
mesa: scry again if previous +peek blocked
63ec415
@yosoyubik
nock: revert byte padding nock.c
5e59720
@pkova
Merge branch 'next/kelvin/410' into develop
79241e1
@pkova
build: merge develop to next/kelvin/410, convert lagoon to zig build
f1d8477
@pkova
Merge develop to next/kelvin/410 (#737)
24054c9
@pkova
Revert "nock: revert byte padding nock.c"
7580828 
This reverts commit 5e59720.
@pkova
Merge branch 'next/kelvin/410' into mesa-pairs
4232f8e
@yosoyubik
Revert "bazel: delete bazel build system"
c4ba180 
This reverts commit 6d3f9b2.
@yosoyubik
mesa: no-op if waiting for scry response
bbb93ae
@pkova
tree: restructure jet dashboard for easy upgrades
793046b
@pkova
build: upgrade VERSION to 3.2
83e2517
@pkova pkova requested a review from a team as a code owner October 21, 2024 14:47
@pkova
build: restore ed sign and veri jets for 138
7f3c040 
These were mistakenly removed in aba8da4
@pkova
Revert "Revert "bazel: delete bazel build system""
c337d9a 
This reverts commit c4ba180.

We had some problems with the new zig build system so we brought
bazel back for a little bit to triage. The problems were fixed by
upgrading GMP to 6.3.0 in a537c85.
@pkova pkova merged commit 063f968 into develop Oct 22, 2024
2 checks passed
@pkova pkova deleted the mesa-pairs branch October 22, 2024 13:12
@pkova pkova restored the mesa-pairs branch October 22, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@pkova @belisarius222 @midden-fabler @lukechampine @tinnus-napbus @matthew-levan @sigilante @yosoyubik @joemfb @ripperi