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

Upmerge 12-16 #4466

Merged
merged 9 commits into from
Dec 18, 2024
Merged

Upmerge 12-16 #4466

merged 9 commits into from
Dec 18, 2024

Conversation

hhunter-ms
Copy link
Collaborator

No description provided.

hhunter-ms and others added 8 commits December 16, 2022 12:11
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Reworded concurrency control doc
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
Crypto is still in alpha, so the URLs shouldn't point to v1.0 values
* Update setup-aws-snssqs.md

Add `concurrencyLimit` parameter description.

Signed-off-by: Gustavo Chaín <me@qustavo.cc>

* Update daprdocs/content/en/reference/components-reference/supported-pubsub/setup-aws-snssqs.md

Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Gustavo Chaín <me@qustavo.cc>

* Update setup-aws-snssqs.md

Added     # - name: concurrencyLimit into example

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

---------

Signed-off-by: Gustavo Chaín <me@qustavo.cc>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
@hhunter-ms hhunter-ms added this to the 1.15 milestone Dec 16, 2024
@hhunter-ms hhunter-ms self-assigned this Dec 16, 2024
@hhunter-ms hhunter-ms requested review from a team as code owners December 16, 2024 15:51
Copy link
Member

@msfussell msfussell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@hhunter-ms hhunter-ms merged commit 15f8b3b into dapr:v1.15 Dec 18, 2024
4 checks passed
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.

5 participants