Merge main (at v4-rc1) into 4.x (recreated) #414
Merged
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
* Add Valkey to Redis samples * Update links to Cloud Foundry and brokers * Update pivotal links * Update getting started links for TAP * Update links to v3 docs, remove links to guides * Fix remaining links * Update links to CF CLI * Update SSO links * Update TAP links * Replace Kubernetes prerequisite with Tanzu CLI
* Replace FileShare sample with new .NET 8 app * Add fileshare integration test, ability to skip logging during service creation * Apply suggestions from code review Co-authored-by: Bart Koelman <[email protected]> * Address feedback - nicer scripts - cleaner code - catch attempted uploads of files > 128MB - time-based upload file names - use IOptions to hold fileshare info - mention * Apply suggestions from code review Co-authored-by: Bart Koelman <[email protected]> * address PR Feedback - rename create-user script to add-user - FolderPath => SharePath - add hostedservice to manage fileshare connection, drop IOptions - add build badge - it's prettier * Apply suggestions from code review Co-authored-by: Bart Koelman <[email protected]> * PR feedback - HTTP DELETE - build badge `/` encoding - move project readme up a couple levels - file share config in singleton object - use a ViewModel for upload * Apply suggestions from code review Co-authored-by: Bart Koelman <[email protected]> * PR feedback - table for uploaded files - js formatting * fix badge, don't set ASPNETCORE_ENVIRONMENT * use DiskSpaceHealthContibutor instead of FileShareHealthContributor * skip configuring (a too-old version of) Ruby --------- Co-authored-by: Bart Koelman <[email protected]>
* Add/update baseline .cfignore files * delete .dockerignore and .tanzuignore
* Remove Cloud Foundry support from CosmosDB sample * Update MongoDB sample * Update MySQL samples * Update PostgreSQL samples * Update RabbitMQ sample * Update Redis sample * Update SQL Server sample
* Update Redis security sample to show DPAPI keys * Reformat file using Rider
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.2 to 2.5.0. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@2.2.2...2.5.0) --- updated-dependencies: - dependency-name: urllib3 dependency-version: 2.5.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [requests](https://github.com/psf/requests) from 2.32.0 to 2.32.4. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.32.0...v2.32.4) --- updated-dependencies: - dependency-name: requests dependency-version: 2.32.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
* Update references to new dev feed * Updates version pattern in project references
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR is identical to #402, which was accidentally squash-merged into the
4.xbranch. As a result, conflicts emerge during future merges. It should have been integrated as a merge commit. This PR aids in recovering from that.The underlying branch of this PR is the same as the original PR, but this PR targets the
4.x-resetbranch (whose content is identical to branch4.x, but with the bad last commit removed). The plan is to merge this PR, then force-push the4.x-resetbranch over4.x.