Skip to content

Conversation

bart-vmware
Copy link
Member

@bart-vmware bart-vmware commented Jul 22, 2025

See the list of intentional differences between the merge source (main at v4-rc1) and 4.x.

bart-vmware and others added 19 commits March 24, 2025 16:15
* 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
@bart-vmware bart-vmware changed the title Merge main 4rc1 into 4x Merge main (at v4-rc1) into 4.x Jul 22, 2025
@bart-vmware bart-vmware changed the base branch from main to 4.x July 22, 2025 09:02
@bart-vmware bart-vmware requested a review from TimHess July 22, 2025 09:04
@bart-vmware bart-vmware marked this pull request as ready for review July 22, 2025 09:04
@bart-vmware bart-vmware merged commit faae6d8 into 4.x Jul 22, 2025
12 checks passed
@bart-vmware bart-vmware deleted the merge-main-4rc1-into-4x branch July 22, 2025 14:32
@bart-vmware bart-vmware restored the merge-main-4rc1-into-4x branch August 22, 2025 08:38
@bart-vmware bart-vmware deleted the merge-main-4rc1-into-4x branch August 22, 2025 08:54
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.

2 participants