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 Mar 4: 1.12 --> 1.13 #4064

Merged
merged 67 commits into from
Mar 4, 2024
Merged

Conversation

hhunter-ms
Copy link
Collaborator

Description

Final upmerge for release

Issue reference

PR will close: #3965

kaibocai and others added 30 commits January 27, 2024 07:04
Java SDK already support creating timer. 

Signed-off-by: kaibocai <89094811+kaibocai@users.noreply.github.com>
Fix incorrect doc for java sdk
Fixes dapr#3303

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
* update incorrect sentence

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

* mark edit

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

---------

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
…e in setup-redis.md

In Redis state store component configuration example (https://docs.dapr.io/reference/components-reference/supported-state-stores/setup-redis/#component-format), "failover" and "sentinelMasterName" fields were duplicated.

This commit removes these duplicates, keeping the most verbose value (eg: "<bool> # Optional. Allowed: true, false" instead of "# Optional") and using the same position as the one in the spec metadata fields part (https://docs.dapr.io/reference/components-reference/supported-state-stores/setup-redis/#spec-metadata-fields).

Signed-off-by: arthbalete <67156595+arthbalete@users.noreply.github.com>
Signed-off-by: Prashant Rewar <108176843+prashantrewar@users.noreply.github.com>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Prashant Rewar <108176843+prashantrewar@users.noreply.github.com>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: Prashant Rewar <108176843+prashantrewar@users.noreply.github.com>
Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Add instructions to open the .dapr folder in the user profile on Windows
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Alessandro (Ale) Segala <43508+ItalyPaleAle@users.noreply.github.com>
Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Documentation (Redis state store) : Removed duplicated fields
…tate-stores/setup-mongodb.md

Signed-off-by: Mark Fussell <markfussell@gmail.com>
…tate-stores/setup-mongodb.md

Signed-off-by: Mark Fussell <markfussell@gmail.com>
…tate-stores/setup-mongodb.md

Signed-off-by: Mark Fussell <markfussell@gmail.com>
Clarify actor state store support for MongoDB
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Add OpenAI to binding spec index page
[Endgame] Remove *old* versions from 1.12 navbar
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
hhunter-ms and others added 23 commits February 9, 2024 11:24
…rkflow/workflow-features-concepts.md

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
[Workflow] Add more documentation around purging
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Signed-off-by: mikeee <hey@mike.ee>
Moved the paragraph down

Signed-off-by: Mark Fussell <markfussell@gmail.com>
…phy how-to. (dapr#3947)

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
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>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Add pre-reqs and section in troubleshooting guide for `dapr init`
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
* update to match code implementation

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

* update to include both seconds and milliseconds

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

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

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

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

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

---------

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
* Updated the text for get-started-api
Signed-off-by: Anindita Das <dasanuiit@gmail.com>

Signed-off-by: Anindita Das <dasanuiit@gmail.com>

* Update daprdocs/content/en/getting-started/get-started-api.md

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

---------

Signed-off-by: Anindita Das <dasanuiit@gmail.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Anindita Das <anindita.das@ibm.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Clarify documentation around `dapr-api-token`
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
@hhunter-ms hhunter-ms added this to the 1.13 milestone Mar 4, 2024
@hhunter-ms hhunter-ms self-assigned this Mar 4, 2024
@hhunter-ms hhunter-ms requested review from a team as code owners March 4, 2024 16:45
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 f28113c into dapr:v1.13 Mar 4, 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.

9 participants