Skip to content

Merge master#2183

Merged
fisx merged 6 commits intodevelopfrom
merge-master
Mar 9, 2022
Merged

Merge master#2183
fisx merged 6 commits intodevelopfrom
merge-master

Conversation

@fisx
Copy link
Contributor

@fisx fisx commented Mar 7, 2022

This also recovers #2162, which has been omitted in the last release.

zebot and others added 5 commits March 7, 2022 14:30
* use assetkey type in imageasset

* fix build integration tests

* moved cql instance for assetkey

* changelog

* tweak changelog.

* asset key cql instance handle invalid keys in db

* comment

* use Icon/AssetKey in team and user profile (wire-api changes only)

* Cassandra Icon instance

* fix integration test

* fix galley integration tests

* fix spar integration tests

* format

Co-authored-by: Matthias Fischmann <mf@zerobuzz.net>
@fisx fisx requested a review from akshaymankar March 7, 2022 15:01
Copy link
Member

@akshaymankar akshaymankar left a comment

Choose a reason for hiding this comment

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

Looks like we lost the changelog for #2162, please add that back.

@fisx
Copy link
Contributor Author

fisx commented Mar 7, 2022

Looks like we lost the changelog for #2162, please add that back.

Can you please look again? It doesn't show in the diff because it hasn't been removed, so it's still there!

@fisx fisx requested a review from akshaymankar March 7, 2022 19:08
@fisx fisx merged commit c968c4a into develop Mar 9, 2022
@fisx fisx deleted the merge-master branch March 9, 2022 06:17
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.

4 participants