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.

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

Automation: Main Next Integrate #11591

Merged
merged 4 commits into from Aug 19, 2022
Merged

Automation: Main Next Integrate #11591

merged 4 commits into from Aug 19, 2022

Conversation

github-actions[bot]
Copy link
Contributor

Main-next integrate PR

The aim of this pull request is to sync main and next branch. The expectation from the assignee is as follows:

  • Acknowledge the pull request by adding a comment -- "Actively working on it".
  • Resolve any merge conflicts between this branch and next (and push the resolution to this branch). Merge next into this branch if needed. Do NOT rebase or squash this branch: its history must be preserved.
  • Ensure CI is passing for this PR, fixing any issues. Please don't look into resolving Real service e2e test and Stress test failures as they are non-required CI failures.
  • Once the PR is ready for merge, please add a comment @mentioning the reviewers to get this PR merged in. Thank you!!

For more information about how to resolve merge conflicts and CI failures, visit [this wiki page]
(https://github.com/microsoft/FluidFramework/wiki/Main-next-Automation).

Abe27342 and others added 2 commits August 18, 2022 10:31
@Abe27342
Allow querying for interval from its local reference endpoint (#11582)
1dd9cec 
Co-authored-by: Abram Sanderson <absander@microsoft.com>
@yann-achard-MS @alex-pardes
Changeset Inverses Brain Dump Doc (#11484)
fe10534 
* WIP

* WIP

* WIP

* WIP

* First draft of "undo semantics" section

* Rebased-induced inverses

* WIP: Computing the Effects of Undo

* WIP

* WIP: proposed design

* Table and tweaks

* More

* Computing Undo Changes section

* Addressing Concurrency

* Sourcing Relevant Data

* Late Repair Data Concretization

* design goals and what they tell us

* Design Proposal

* Tweaks

* Tweaks

* Abstract vs concrete undos

* Move to WIP folder

* Apply suggestions from code review

Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com>

* PR feedback

Co-authored-by: alex-pardes <105307164+alex-pardes@users.noreply.github.com>
@github-actions github-actions bot requested a review from a team as a code owner August 18, 2022 18:07
@github-actions github-actions bot added area: dds Issues related to distributed data structures area: dds: sharedstring public api change Changes to a public API base: next PRs targeted against next branch labels Aug 18, 2022
@Abe27342
Copy link
Contributor

@sonalivdeshpande --merge conflicts should be fixed. Please ping me if there are any issues :)

@msfluid-bot
Copy link
Collaborator

msfluid-bot commented Aug 18, 2022 •
edited

⯅ @fluid-example/bundle-size-tests: +15.8 KB
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 392.45 KB 394.18 KB ⯅ +1.74 KB
connectionState.js 680 Bytes 680 Bytes ■ No change
containerRuntime.js 191.92 KB 197.48 KB ⯅ +5.55 KB
loader.js 151.12 KB 151.06 KB ⯆ -57 Bytes
map.js 42.63 KB 47.38 KB ⯅ +4.75 KB
matrix.js 131.63 KB 134.39 KB ⯅ +2.77 KB
odspDriver.js 150.23 KB 150.11 KB ⯆ -127 Bytes
odspPrefetchSnapshot.js 38.39 KB 38.35 KB ⯆ -41 Bytes
sharedString.js 152.42 KB 153.64 KB ⯅ +1.21 KB
Total Size 1.25 MB 1.27 MB ⯅ +15.8 KB

Baseline commit: fe10534

Generated by 🚫 dangerJS against 3c69f9e

@sonalivdeshpande sonalivdeshpande requested review from a team as code owners August 18, 2022 23:26
@Abe27342 Abe27342 force-pushed the main-next-fe105348f61d8be7e730e702cc49e1394d88a6a4 branch from 048bf9f to 3c69f9e Compare August 19, 2022 17:28
@sonalivdeshpande
Copy link
Contributor

thank you @Abe27342 @yann-achard-MS!!

@sonalivdeshpande sonalivdeshpande merged commit 91ac09c into next Aug 19, 2022
@sonalivdeshpande sonalivdeshpande deleted the main-next-fe105348f61d8be7e730e702cc49e1394d88a6a4 branch August 19, 2022 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sonalivdeshpande sonalivdeshpande sonalivdeshpande approved these changes

@tylerbutler tylerbutler Awaiting requested review from tylerbutler

Assignees

@yann-achard-MS yann-achard-MS

Labels
area: dds: sharedstring area: dds Issues related to distributed data structures base: next PRs targeted against next branch community-contribution do-not-squash-merge main-next-integrate public api change Changes to a public API
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Abe27342 @msfluid-bot @sonalivdeshpande @tylerbutler @yann-achard-MS