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 1.12 --> 1.13 #3976

Merged
merged 42 commits into from
Jan 26, 2024
Merged

Upmerge 1.12 --> 1.13 #3976

merged 42 commits into from
Jan 26, 2024

Conversation

hhunter-ms
Copy link
Collaborator

hhunter-ms and others added 30 commits September 20, 2023 17:56
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
[Endgame] Prep v1.11 branch for 1.12 release
* update s3 bindings links

Signed-off-by: Ilia Stepin <stepinilya@gmail.com>

* Update s3.md

Signed-off-by: Ilia Stepin <stepinilya@gmail.com>

---------

Signed-off-by: Ilia Stepin <stepinilya@gmail.com>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
Signed-off-by: joshvanl <me@joshvanl.dev>
* fix link

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

* try again with link

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

* pub-sub

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

---------

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Co-authored-by: Hannah Hunter <hannahhunter@microsoft.com>
….11.6

1.11 update supported releases up to 1.11.6
Signed-off-by: Luigi Rende <luigirende@gmail.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Fix some mistakes in the doc and try to make it better and more clear

Signed-off-by: Farshad Davoudi <f.davoudi.r@outlook.com>
…ka pub/sub (dapr#3935)

Signed-off-by: Simon Headley <headleysj@gmail.com>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
* add prefix to spec

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

* add prefix to example

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

---------

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
dapr#3934)

* Adding write performance optimization section to Cosmos DB state store documentation

Signed-off-by: Simon Headley <headleysj@gmail.com>

* Applying suggestions as per PR review

Signed-off-by: Simon Headley <headleysj@gmail.com>

* Switching from Markdown note to {{% alert %}} {$ /alert $}} as per PR review

Signed-off-by: Simon Headley <headleysj@gmail.com>

* Putting example paragraph in a new line as per review

Signed-off-by: Simon Headley <headleysj@gmail.com>

---------

Signed-off-by: Simon Headley <headleysj@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Add new operations in the query request for state component
…pr#3942)

* Add devcontainer with Hugo

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Add Node and install script

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Update README with devcontainer

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Add .

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Update README.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Increment step numbers

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Clarify devcontainer in other IDEs

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* revert back to old numbering

Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* revert back to old numbering

Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* revert back to old numbering

Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* revert back to old numbering

Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

---------

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
…cs (dapr#3931)

* Describing Kafka consumer behaviour when consuming from multiple topics

Signed-off-by: Simon Headley <headleysj@gmail.com>

* Further specifying the behaviour of Kafka consumer groups on topics.

Signed-off-by: Simon Headley <headleysj@gmail.com>

* Changing 'this will guarantee' to 'this guarantees' as per PR review

Signed-off-by: Simon Headley <headleysj@gmail.com>

* Update daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md

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

---------

Signed-off-by: Simon Headley <headleysj@gmail.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>
)

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Added the missing `-k` flag in the Kubernetes Deploy docs.

Signed-off-by: Yetkin Timocin <ytimocin@microsoft.com>
* Added Crypto API reference documentation. Updated error codes weight so it's last in list.

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Added Crypto API reference documentation. Updated error codes weight so it's last in list.

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Update daprdocs/content/en/reference/api/cryptography_api.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Update daprdocs/content/en/reference/api/cryptography_api.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Minor text update

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Update daprdocs/content/en/reference/api/cryptography_api.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Update daprdocs/content/en/reference/api/cryptography_api.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Update daprdocs/content/en/reference/api/cryptography_api.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Update daprdocs/content/en/reference/api/cryptography_api.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Added related link to API reference on Crypto overview page.

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

---------

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
The notice about random numbers was a bit confusing.

Signed-off-by: jhberge <36478438+jhberge@users.noreply.github.com>
…s for production scenarios. (dapr#3967)

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
Signed-off-by: Prashant Rewar <108176843+prashantrewar@users.noreply.github.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
hhunter-ms and others added 12 commits January 26, 2024 13:50
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
…art.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Update step 5 of pubsub-quickstart.md
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
@hhunter-ms hhunter-ms added this to the 1.13 milestone Jan 26, 2024
@hhunter-ms hhunter-ms self-assigned this Jan 26, 2024
@hhunter-ms hhunter-ms requested review from a team as code owners January 26, 2024 20:41
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.

Should we include this file - daprdocs/layouts/shortcodes/dapr-latest-version.html
Or fix this up to be v1.13.0 afterwards?

@hhunter-ms
Copy link
Collaborator Author

Should we include this file - daprdocs/layouts/shortcodes/dapr-latest-version.html Or fix this up to be v1.13.0 afterwards?

I think we typically update this in one of the other PRs in the endgame issue

@hhunter-ms hhunter-ms merged commit 72e139d into dapr:v1.13 Jan 26, 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.