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

sync dev w/ main #324

Merged
merged 5 commits into from
Oct 23, 2023
Merged

sync dev w/ main #324

merged 5 commits into from
Oct 23, 2023

Conversation

davidmrdavid
Copy link
Member

@davidmrdavid davidmrdavid commented Oct 21, 2023

Seems w/ checkpointing mitigation PR was merged directly to main (since it's the default branch), but several features are in dev instead.

This PR syncs dev w/ main so that it can obtain the mitigation PR changes.

As an aside: why is main the default branch if PRs should be merged to dev by default? Should we change this?

bachuv and others added 5 commits August 31, 2023 12:03
…TFx (#323)

Bumps [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) from 1.7.0 to 1.10.2.
- [Release notes](https://github.com/Azure/azure-sdk-for-net/releases)
- [Commits](Azure/azure-sdk-for-net@Azure.Identity_1.7.0...Azure.Identity_1.10.2)

---
updated-dependencies:
- dependency-name: Azure.Identity
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sebastianburckhardt sebastianburckhardt merged commit fb4aa61 into dev Oct 23, 2023
4 checks passed
sebastianburckhardt added a commit that referenced this pull request Oct 23, 2023
* Update CreationRequestReceived.cs

* remove the faster-alternate data store and fix broken deserialization. (#308)

* fix and instrument commitlog serialization and deserialization. (#305)

* fix discard of packets so the next packet to expect is updated correctly (#302)

* New EventHubs performance tests (#178)

* rebase, and remove changes to scale monitor

* add hello cities test that prints the history of a nested orchestration

* implement a watchdog that terminates CompletePending quickly if it hangs (#318)

* add unique id to scale monitor constructor (#316)

* fix bugs from PR #302 (#315)

* fix cache size reporting (#321)

* added a comment

* update durable task package references to 2.15.1 and 2.12.0 (#317)

* update DT and DF package references

* update to latest

* sync dev w/ main (#324)

* Update GH automation (#303)

* initial commit (#290)

* Revert "initial commit (#290)" (#314)

This reverts commit 3a2d193.

* Bump Azure.Identity from 1.7.0 to 1.10.2 in /samples/TokenCredentialDTFx (#323)

Bumps [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) from 1.7.0 to 1.10.2.
- [Release notes](https://github.com/Azure/azure-sdk-for-net/releases)
- [Commits](Azure/azure-sdk-for-net@Azure.Identity_1.7.0...Azure.Identity_1.10.2)

---
updated-dependencies:
- dependency-name: Azure.Identity
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Terminate partition when FASTER refuses to checkpoint for over a minute (#301)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Varshitha Bachu <[email protected]>
Co-authored-by: Sebastian Burckhardt <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Sebastian Burckhardt <[email protected]>
Co-authored-by: David Justo <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants