Upmerge2 06 03 #1536
Merged
Upmerge2 06 03 #1536
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Supported Release Info and Upgrade Path for v1.2 * Update support-release-policy.md * Update daprdocs/content/en/operations/support/support-release-policy.md Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
* Adding table of kubernetes versions * Updating intro
Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
* Update docs on using Codespaces with Dapr repos * Move codespaces.md under the Contributing topic * Update daprdocs/content/en/contributing/codespaces.md Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
The `https://kubernetes-charts.storage.googleapis.com/` location is no longer used, so this change updates this, the command to install, and the missing update step that will cause the install to fail if an update was never done after adding the location. Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
|
Azure Static Web Apps: Your stage site is ready! Visit it here: https://red-forest-07699d11e-1536.westus2.azurestaticapps.net |
msfussell
approved these changes
Jun 3, 2021
sk593
pushed a commit
to sk593/docs
that referenced
this pull request
Jul 20, 2021
* Supported Release Info and Upgrade Path for v1.2 (dapr#1494) * Supported Release Info and Upgrade Path for v1.2 * Update support-release-policy.md * Update daprdocs/content/en/operations/support/support-release-policy.md Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com> * Adding K8s versions table (dapr#1521) * Adding table of kubernetes versions * Updating intro * Fix incorrect postgresql connection string example (dapr#1524) Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com> * Update docs on using Codespaces with Dapr repos (dapr#1522) * Update docs on using Codespaces with Dapr repos * Move codespaces.md under the Contributing topic * Update daprdocs/content/en/contributing/codespaces.md Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com> * Fix two typos (dapr#1526) Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com> * Update chinese content (dapr#1527) Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com> * Updated to fix deprecated helm chart location (dapr#1528) The `https://kubernetes-charts.storage.googleapis.com/` location is no longer used, so this change updates this, the command to install, and the missing update step that will cause the install to fail if an update was never done after adding the location. Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com> * nr_consul_typo fixed malformed yaml (dapr#1532) Co-authored-by: Aaron Crawfis <Aaron.Crawfis@microsoft.com> Co-authored-by: Bernd Verst <berndverst@users.noreply.github.com> Co-authored-by: Mark Fussell <mfussell@microsoft.com> Co-authored-by: Zonciu Liang <zonciu@zonciu.com> Co-authored-by: Simon Leet <31784195+CodeMonkeyLeet@users.noreply.github.com> Co-authored-by: Maarten Mulders <mthmulders@users.noreply.github.com> Co-authored-by: Newbe36524 <newbe36524@qq.com> Co-authored-by: Steven Jenkins De Haro <20492442+StevenJDH@users.noreply.github.com> Co-authored-by: Abdulaziz Elsheikh <abdulaziz.elsheikh@gmail.com> resolving merge conflicts in rebase
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upmerge v1.2 to v1.3