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

upstream latest changes after version release #174

Merged
merged 40 commits into from
Mar 31, 2023

Conversation

paullatzelsperger
Copy link
Contributor

@paullatzelsperger paullatzelsperger commented Mar 31, 2023

After releasing version 0.3.2 there where a couple of last minute fixes and changes that needed to be done, as well as the merge commits after the release.

These should now be upstreamed.

the sheer amount of commits is because of the merge main -> develop

stephanbcbauer and others added 30 commits March 27, 2023 16:03
Cherry-picked upstream commits (QGate stuff) in preparation for the 0.3.1 release
Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
@SebastianBezold SebastianBezold merged commit f21c158 into eclipse-tractusx:develop Mar 31, 2023
@florianrusch-zf
Copy link
Contributor

@SebastianBezold you merged it to early...there is at least one wrong change in the files.

Copy link
Contributor

@florianrusch-zf florianrusch-zf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paullatzelsperger will you fix this in another PR?

Comment on lines +81 to +84
- bugfix: Fix slow AES encryption (#746)
- Fix typo in tractusx-connector values.yaml comment
- Fix not working docu link in README.md
- Fix typo in control-plane adapter README
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still a doublet

@SebastianBezold
Copy link
Contributor

@SebastianBezold you merged it to early...there is at least one wrong change in the files.

Oh I'm sorry @florianrusch-zf , should we revert?

@paullatzelsperger
Copy link
Contributor Author

paullatzelsperger commented Mar 31, 2023

@florianrusch-zf @SebastianBezold let me fix this in another pr pls: #175

paullatzelsperger pushed a commit to paullatzelsperger/tractusx-edc that referenced this pull request May 4, 2023
upstream latest changes after version release
paullatzelsperger pushed a commit that referenced this pull request May 4, 2023
upstream latest changes after version release
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.

6 participants