dapr
/
docs
mirror of https://github.com/dapr/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,329 Commits 25 Branches 11 Tags 457 MiB
Commit Graph

5140 Commits

Author SHA1 Message Date
Hannah Hunter 4534e1720e update instructions and add template file 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-10-22 13:57:24 -04:00
Hannah Hunter e27dd9fcf8 update contributing guide pt 1 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-10-21 16:07:42 -04:00
Hannah Hunter c3b0059b68 fix typo in code 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-10-21 15:00:40 -04:00
Whit Waldo 8526e2937a
Merge branch 'v1.14' into streaming-subscription-dotnet 2024-10-17 12:59:06 -05:00
Mark Fussell fe17926ead
Fixed typo (#4389) 2024-10-11 13:32:30 -07:00
Mark Fussell f98ac60ed1
Update support (#4387) 2024-10-11 13:05:53 -07:00
Yaron Schneider 0163c0b8e7
add roadmap to main page (#4386) 
Signed-off-by: yaron2 <schneider.yaron@live.com>
 2024-10-11 10:41:03 -07:00
Cassie Coyle e3068a9a5d
[Jobs API] Describe Triggered Job Handling Assumptions (#4376) 
* add specific logic for what assumptions are made for triggered jobs for http, grpc, sdks

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* rm space

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* add a note about this applying to all programming languages to avoid confusion

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* Update howto-schedule-and-handle-triggered-jobs.md

Signed-off-by: Yaron Schneider <schneider.yaron@live.com>

---------

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
Signed-off-by: Yaron Schneider <schneider.yaron@live.com>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
 2024-10-10 14:59:09 -07:00
Yaron Schneider ae6d065260
fix misleading wording (#4379) 
Signed-off-by: yaron2 <schneider.yaron@live.com>
 2024-10-10 12:02:57 -07:00
Cassie Coyle 3dc932d535
rm decoding (#4373) 
Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
 2024-10-07 16:30:34 -07:00
Yaron Schneider ed7aee88e0
Workflow limitations change (#4367) 
* workflow limitations change

Signed-off-by: yaron2 <schneider.yaron@live.com>

* Update daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-overview.md

Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>

* Update daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-overview.md

Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>

---------

Signed-off-by: yaron2 <schneider.yaron@live.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-10-03 07:58:28 -07:00
Hannah Hunter 3d10ea69f9
Merge branch 'v1.14' into actor-state-clarification 2024-10-03 09:08:39 -04:00
Mark Fussell 2f23f60405
Merge branch 'v1.14' into actor-state-clarification 2024-10-03 13:51:07 +01:00
Hannah Hunter a615470bd8
Merge branch 'v1.14' into fix-azure-service-bus-docs 2024-10-03 08:48:13 -04:00
Mark Fussell 5259124b0b
Update daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus-topics.md 
Signed-off-by: Mark Fussell <markfussell@gmail.com>
 2024-10-03 13:36:22 +01:00
Mark Fussell d53db35025
Merge branch 'v1.14' into patch-1 2024-10-03 13:34:14 +01:00
Michael Klich 4e52974a1d
Update howto-invoke-non-dapr-endpoints.md (#4369) 
Update service invocation steps according to diagram

Signed-off-by: Michael Klich <inirudebwoy@users.noreply.github.com>
 2024-10-03 13:31:07 +01:00
Hannah Hunter f3b1fc4ac8
Merge branch 'v1.14' into patch-1 2024-10-03 08:30:16 -04:00
Andrew Riddlestone dd1fe6aa67
Update setup-azure-servicebus-topics.md 
Signed-off-by: Andrew Riddlestone <andrew.riddlestone@gmail.com>
 2024-10-02 01:44:44 +01:00
Yaron Schneider 4cb0f9cc05
Merge branch 'v1.14' into actor-state-clarification 2024-10-01 17:37:40 -07:00
Whit Waldo e09c0c520f
Merge branch 'v1.14' into streaming-subscription-dotnet 2024-09-30 21:42:07 -05:00
Hannah Hunter f390f740fa
update latest and recalled versions (#4360) 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-09-26 14:46:16 -07:00
Vasily Chekalkin 18dc1cbee6 Update workflow-patterns.md 
Make monitor code samples consistent between python/go and all other examples.

* Python and Go are using seconds
* Everything else is in minutes.

Signed-off-by: Vasily Chekalkin <bacek@bacek.com>
 2024-09-23 11:54:04 +10:00
Whit Waldo 24f2ff9c44
Merge branch 'v1.14' into actor-state-clarification 2024-09-19 12:38:27 -05:00
Whit Waldo 8686de1950 Reworded slightly 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
 2024-09-19 12:37:31 -05:00
Whit Waldo 2133954989 Clarifiied need for the actorStateStore property in docs, regardless of whether the actor actually stores any state. 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
 2024-09-19 12:33:51 -05:00
Whit Waldo 10810db824
Merge branch 'v1.14' into streaming-subscription-dotnet 2024-09-19 08:29:37 -05:00
Whit Waldo 8aa121259f Added .NET implementation detail for streaming subscription support 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
 2024-09-16 14:47:24 -05:00
Whit Waldo 770f1533eb Reflecting valid value of 0-6, not 0-7 in jobs schedule 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
 2024-09-16 14:18:01 -05:00
Josh van Leeuwen 90c0906c01
Helm: Revert Scheduler storage quota size to `1Gi` (#4354) 
In v1.14.3, the storage quota size for the Scheduler volume was
increased from `1Gi` to `16Gi`. This is because users where encountering
disk exhaustion fatal errors on the Scheduler under normal usage.
Because the volume size request field is protected from updates, Dapr
version upgrades to v1.14.3 failed without manual intervention.

Reverts the Scheduler storage quota size back to `1Gi`, and adds
warnings that the volume size may need to be increased for production
deployments.

See: https://github.com/dapr/dapr/pull/8107

Signed-off-by: joshvanl <me@joshvanl.dev>
 2024-09-16 06:44:29 -07:00
Josh van Leeuwen 634d355d20
Update Job HTTP request API (#4349) 
According to https://github.com/dapr/dapr/pull/8083

Signed-off-by: joshvanl <me@joshvanl.dev>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
 2024-09-13 17:37:34 -07:00
Hannah Hunter 9128eebb36
update latest version to 1.14.2 (#4352) 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
 2024-09-13 14:35:21 -07:00
Hannah Hunter 80b811b17e
Merge branch 'v1.14' into tweak-otel-tracing-endpoint 2024-09-13 11:32:26 -04:00
Whit Waldo f9a40ba0ef Updated to reflect the need for the protocol on the zipkin endpoint though it's not necessary on the otel endpoint. 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
 2024-09-13 06:55:53 -05:00
Whit Waldo 69a685a552 Tweaked the endpoint description and example to reflect that the protocol may or may not be necessary based on the provider used. 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
 2024-09-13 06:28:38 -05:00
Whit Waldo 9a3482cfb8 Fixed cron schedule table 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
 2024-09-13 05:51:52 -05:00
Hannah Hunter 300e4add15
Merge branch 'v1.14' into scheduler-docker-compose 2024-09-12 11:39:19 -04:00
Hannah Hunter c8c99e3d90
Merge branch 'v1.14' into issue_4117 2024-09-11 15:47:07 -04:00
Hannah Hunter 54730f70e8 Merge branch 'issue_4117' of https://github.com/hhunter-ms/docs into issue_4117 2024-09-11 12:26:15 -04:00
Hannah Hunter 8d2f64d10d clarify per josh comment 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-09-11 12:25:36 -04:00
Cassie Coyle 6ee59682ef
rm escape (#4348) 
Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
 2024-09-10 14:42:24 -07:00
Mike Nguyen 2a595ee406
Merge branch 'v1.14' into scheduler-docker-compose 2024-09-09 13:05:28 +01:00
Whit Waldo 442b720d0f
Updated workflow to reflect deprecation of Workflow methods on client (#4336) 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-09-07 11:46:57 -07:00
Mark Fussell 24761e5115
Merge branch 'v1.14' into scheduler-docker-compose 2024-09-06 19:49:27 -07:00
Mark Fussell a391452b1d
Merge branch 'v1.14' into issue_4117 2024-09-06 19:29:43 -07:00
Mark Fussell 1ca8fd8920
update alias (#4347) 2024-09-06 18:14:02 -07:00
Yaron Schneider ca61d77c72
fix job api http reference (#4343) 
Signed-off-by: yaron2 <schneider.yaron@live.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
 2024-09-06 17:20:08 -07:00
Mark Fussell ef0a5b5641
conductor update (#4344) 2024-09-06 17:08:12 -07:00
Yaron Schneider 02a9bf743e
Update roadmap.md (#4340) 
* Update roadmap.md

Signed-off-by: Yaron Schneider <schneider.yaron@live.com>

* Update roadmap.md

Signed-off-by: Yaron Schneider <schneider.yaron@live.com>

---------

Signed-off-by: Yaron Schneider <schneider.yaron@live.com>
 2024-09-06 14:42:53 -07:00
Anton Troshin 0e22a69243
Add Kafka escapeHeaders documentation (#4332) 
* Add Kafka escapeHeaders documentation

Signed-off-by: Anton Troshin <anton@diagrid.io>

* update the escapeHeaders setting docs

Signed-off-by: Anton Troshin <anton@diagrid.io>

* review fixes

Signed-off-by: Anton Troshin <anton@diagrid.io>

---------

Signed-off-by: Anton Troshin <anton@diagrid.io>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
 2024-09-06 11:26:39 -07:00
Hannah Hunter 581fabb155
update latest version (#4341) 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-09-05 14:32:22 -07:00
Hannah Hunter 27a392e2c6 add notes about namespacing 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-09-04 15:14:29 -04:00
Hannah Hunter be68cccd0b
Merge branch 'v1.14' into scheduler-docker-compose 2024-09-04 12:17:01 -04:00
Hannah Hunter 35ae6359a9
Merge branch 'v1.14' into issue_4141 2024-09-03 13:46:47 -04:00
Mike Nguyen 108404da4c
Merge branch 'v1.14' into scheduler-docker-compose 2024-09-03 10:56:01 +01:00
Adrian Hristov 01dd8728ca
fixed yaml syntax for v2alpha1 example (#4335) 
Signed-off-by: Adrian Hristov <adrian@intelligentgrowthsolutions.com>
 2024-09-02 07:48:43 -07:00
Hannah Hunter 1495304839 update per mark, pt 2 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-30 17:38:02 -04:00
Mike Nguyen da08767a91
docs: init scheduler in the docker compose example 
Signed-off-by: Mike Nguyen <hey@mike.ee>
 2024-08-29 00:21:55 +01:00
Hannah Hunter c3d5f102f6 Merge branch 'issue_4141' of https://github.com/hhunter-ms/docs into issue_4141 2024-08-26 10:50:25 -04:00
Hannah Hunter 38166048ef last update per mark review 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-26 10:50:07 -04:00
Hannah Hunter aaa7fb794a
Merge branch 'v1.14' into issue_4141 2024-08-23 17:13:44 -04:00
Hannah Hunter 04fad461c5
Update daprdocs/content/en/operations/configuration/configuration-overview.md 
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-08-23 17:13:03 -04:00
Hannah Hunter 9fb3cbf416
Update daprdocs/content/en/operations/configuration/configuration-overview.md 
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-08-23 17:12:49 -04:00
Hannah Hunter dfaf3a88fc
Update daprdocs/content/en/operations/configuration/configuration-overview.md 
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-08-23 17:12:39 -04:00
Hannah Hunter 892020a9b5
Update daprdocs/content/en/operations/configuration/configuration-overview.md 
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-08-23 17:12:29 -04:00
Hannah Hunter 196a3f3bf9
Update daprdocs/content/en/operations/configuration/configuration-overview.md 
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-08-23 17:12:21 -04:00
Mark Fussell 431adb6bb9
Merge branch 'v1.14' into prometheus-auto-service-discovery 2024-08-23 11:54:09 -05:00
Marc Duiker 5945b1de07 Add Jobs API to Dapr slidedeck 
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
 2024-08-22 22:42:45 +02:00
Hannah Hunter 28b3b71f4f
add note about implicit retries (#4325) 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-22 09:28:02 -05:00
Hannah Hunter 5aedc3af5e
Merge branch 'v1.14' into prometheus-auto-service-discovery 2024-08-20 08:17:48 -04:00
Maulin Desai 03b82503bd Merge branch 'v1.14' into prometheus-auto-service-discovery 2024-08-20 13:25:38 +05:30
Maulin Desai e3f29b09ae Format service discovery instructions 
Updated the navigation instructions to use bold text for "Status" and "Service Discovery" for better visual clarity.

Signed-off-by: Maulin Desai <mdesai@bosleo.com>
 2024-08-20 10:38:41 +05:30
Mark Fussell 76b9019f69
Merge branch 'v1.14' into issue_4144 2024-08-19 17:15:19 -05:00
Hannah Hunter 9f1ece0664
clarify docs (#4324) 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-19 17:13:14 -05:00
Hannah Hunter a4f97b320e clarify/correct quickstarts 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-19 15:18:46 -04:00
Hannah Hunter efd5d0f5ad
Merge branch 'v1.14' into issue_4141 2024-08-19 14:14:32 -04:00
Maulin Desai bcfa46244a Add Prometheus auto service discovery instructions to 
prometheus.md

- Updated prometheus.md with instructions for setting up Prometheus auto service discovery for Dapr and sidecar targets.

Signed-off-by: Maulin Desai <mdesai@bosleo.com>
 2024-08-17 15:38:22 +05:30
Cassie Coyle 3b38ae3ecc
add storageClass example for s3 metadata (#4308) 
* add storageClass example to docs

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* add field to table

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* update data indentation for example curl

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* Update daprdocs/content/en/reference/components-reference/supported-bindings/s3.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Cassie Coyle <cassie.i.coyle@gmail.com>

* tweaks

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* add to template example

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* add doc link for storage class

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* Update daprdocs/content/en/reference/components-reference/supported-bindings/s3.md

Signed-off-by: Mark Fussell <markfussell@gmail.com>

* Update daprdocs/content/en/reference/components-reference/supported-bindings/s3.md

Signed-off-by: Mark Fussell <markfussell@gmail.com>

* Update daprdocs/content/en/reference/components-reference/supported-bindings/s3.md

Signed-off-by: Mark Fussell <markfussell@gmail.com>

---------

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
Signed-off-by: Cassie Coyle <cassie.i.coyle@gmail.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
 2024-08-16 14:44:10 -07:00
Cassie Coyle ecf9637bdc
Fix: Scheduler Actor Reminders Wording (#4320) 
* update phrasing to be scheduler actor reminders bc the jobs api has nothing to do with it really

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

* Update daprdocs/content/en/operations/support/support-preview-features.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Cassie Coyle <cassie.i.coyle@gmail.com>

---------

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
Signed-off-by: Cassie Coyle <cassie.i.coyle@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
 2024-08-15 15:57:15 -07:00
Elena Kolevska b3c510d296
Adds clientCert and clientKey fields to spec Redis metadata fields (#4312) 
* Adds clientCert and clientKey fields to spec Redis metadata fields

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* remove

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* removes empty line

Signed-off-by: Elena Kolevska <elena@kolevska.com>

---------

Signed-off-by: Elena Kolevska <elena@kolevska.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
 2024-08-14 18:58:22 -07:00
Anton Troshin 034f726018
Add AWS IAM authentication fields in PostgreSQL components (#4311) 
* Add AWS IAM authentication fields in PostgreSQL components

Signed-off-by: Anton Troshin <anton@diagrid.io>

* change wording

Signed-off-by: Anton Troshin <anton@diagrid.io>

---------

Signed-off-by: Anton Troshin <anton@diagrid.io>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-08-14 17:39:39 -07:00
Hannah Hunter 35925ce5d4 other versions 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-14 13:58:36 -04:00
Hannah Hunter f1cb59f9d5 fix release 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-14 13:53:17 -04:00
Hannah Hunter a4021ec1e4 fix 1.15 link 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-14 13:48:58 -04:00
Hannah Hunter bbfd9964a1
Update config.toml 
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
 2024-08-14 12:00:24 -04:00
Hannah Hunter 321dcb8f68
Merge branch 'v1.14' into endgame_1.14 2024-08-14 11:49:10 -04:00
Hannah Hunter bf79c1e9d8 update support policy doc 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-14 11:43:54 -04:00
Mark Fussell 30c8060cf8
Merge branch 'v1.14' into asb_applicationproperties 2024-08-13 21:37:47 -07:00
Artur Souza 7a0fab7f56
Update AutoDeleteOnIdleInSec doc to mention value >= 300s (#4309) 
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
 2024-08-13 21:22:54 -07:00
Mark Fussell 522524fdb4
Update daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus-topics.md 
Signed-off-by: Mark Fussell <markfussell@gmail.com>
 2024-08-13 21:20:00 -07:00
Mark Fussell d34bebbd74
Update daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus-queues.md 
Signed-off-by: Mark Fussell <markfussell@gmail.com>
 2024-08-13 21:19:55 -07:00
Mark Fussell 1e30652411
Update daprdocs/content/en/reference/components-reference/supported-bindings/servicebusqueues.md 
Signed-off-by: Mark Fussell <markfussell@gmail.com>
 2024-08-13 21:19:50 -07:00
Artur Souza 6c1c863cf5 Document adding ApplicationProperties to ASB message 
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
 2024-08-13 19:32:43 -07:00
Cassie Coyle 0f3729553c
add ackDeadline to list (#4307) 
Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
 2024-08-13 17:33:46 -07:00
Josh van Leeuwen 9bb20a0df7
Adds docs on using Scheduler with Ephemeral storage (#4306) 
Signed-off-by: joshvanl <me@joshvanl.dev>
 2024-08-13 11:54:08 -07:00
Hannah Hunter 271ab96b7f add to args and annotations doc 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-08 15:28:07 -04:00
Hannah Hunter d05d081072 add note about default app-max-concurrency 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-08 14:31:30 -04:00
Hannah Hunter e42b521238 typo 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-08 13:43:37 -04:00
Hannah Hunter 31830bfeea finish freshness pass 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-08 13:36:16 -04:00
Hannah Hunter d41dd5753c merge conflicts 
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
 2024-08-08 12:50:52 -04:00