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.13 --> 1.14 #4128

Merged
merged 42 commits into from
May 6, 2024
Merged

Upmerge 1.13 --> 1.14 #4128

merged 42 commits into from
May 6, 2024

Conversation

hhunter-ms
Copy link
Collaborator

No description provided.

hhunter-ms and others added 30 commits March 5, 2024 15:56
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Newbe36524 <newbe36524@qq.com>
Signed-off-by: Newbe36524 <newbe36524@qq.com>
Signed-off-by: Newbe36524 <newbe36524@qq.com>
Signed-off-by: Newbe36524 <newbe36524@qq.com>
Signed-off-by: Newbe36524 <newbe36524@qq.com>
Signed-off-by: Newbe36524 <newbe36524@qq.com>
Remove Duplicated keys from head matter
Signed-off-by: newbe36524 <newbe36524@qq.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
add translation in zh-Hans for v1.13
Signed-off-by: Alice Gibbons <alice@diagrid.io>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
* Adjust documentation per `rawPayload=true` requirements

Signed-off-by: Patrick Assuied <patrick.assuied@elationhealth.com>

* small tweak

Signed-off-by: Patrick Assuied <patrick.assuied@elationhealth.com>

* PR feedback

Signed-off-by: Patrick Assuied <patrick.assuied@elationhealth.com>

* more editing

Signed-off-by: Patrick Assuied <patrick.assuied@elationhealth.com>

---------

Signed-off-by: Patrick Assuied <patrick.assuied@elationhealth.com>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
Most of the other options show an example identical to the default value.  This was an exception and could prove confusing when reading the docs

Signed-off-by: Trevor Lund <89029310+tlund101@users.noreply.github.com>
Updated holopin.yaml file to use the default holopin badge for the docs repo.

Signed-off-by: Dan Rios <36534747+riosengineer@users.noreply.github.com>
* adding Dapr Repository Index for contributing

Signed-off-by: Annu Singh <annu.singh@terramate.io>

* adding cli repo

Signed-off-by: Annu Singh <annu.singh@terramate.io>

---------

Signed-off-by: Annu Singh <annu.singh@terramate.io>
Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Trevor Lund <89029310+tlund101@users.noreply.github.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
* update support docs for patch releases

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

* Update daprdocs/content/en/operations/support/support-release-policy.md

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

* Update daprdocs/content/en/operations/support/support-release-policy.md

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

---------

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
* Add Diagrid conductor to integrations

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

* Add diagram

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

* Update daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md

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

* Update daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md

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

* Update daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md

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

* Update daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md

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

* Update daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md

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

* Update daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md

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

---------

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Mark Fussell <markfussell@gmail.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>
hhunter-ms and others added 11 commits April 25, 2024 12:57
Update confusing examples for subscribePollInterval
Add section on graceful shutdown duration
…one with an annotation, not by setting a helm argument (dapr#4124)

Clarify that disabling kubernetes built in secret store can only be done with an annotation, not by setting a helm argument

Signed-off-by: james-bartlett <jamesmbartlett@outlook.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
@hhunter-ms hhunter-ms self-assigned this May 3, 2024
@hhunter-ms hhunter-ms requested review from a team as code owners May 3, 2024 17:05
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
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 5c25364 into dapr:v1.14 May 6, 2024
6 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.

10 participants