Skip to content
This repository has been archived by the owner on Jan 6, 2022. It is now read-only.

Release v1.0.1-rc2 #26

Merged
merged 4 commits into from
Sep 18, 2018
Merged

Release v1.0.1-rc2 #26

merged 4 commits into from
Sep 18, 2018

Conversation

alessandrocapotondi
Copy link
Contributor

Added sobel-filter application

@alessandrocapotondi
Copy link
Contributor Author

@vogelpi @accuminium,

the only branch which is under CI is at the moment the integration branch. If we would continue to use it we should keep such branch aligned with the candidate release that we want to merge on 'master'

@andreaskurth
Copy link
Contributor

Ciao @alessandrocapotondi, thanks for the update. I took the liberty of changing your commit so that the existing line on hero-openmp-examples in the Changelog is updated instead of adding a new line that contradicts (in the version number) the existing one. Let's merge after the call today.

@alessandrocapotondi
Copy link
Contributor Author

alessandrocapotondi commented Sep 18, 2018

Ciao @alessandrocapotondi, thanks for the update. I took the liberty of changing your commit so that the existing line on hero-openmp-examples in the Changelog is updated instead of adding a new line that contradicts (in the version number) the existing one. Let's merge after the call today.

I fixed an issue with the hero-openmp-example's changelog. I missed to update it. The commit for the tag v1.1.0 is pointing the the correct version now.

Copy link
Contributor

@andreaskurth andreaskurth left a comment

Choose a reason for hiding this comment

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

Green from my side, thanks!

@andreaskurth
Copy link
Contributor

andreaskurth commented Sep 18, 2018

I already did the rebase and squash, so you can just do a regular merge and tag

@andreaskurth andreaskurth merged commit 552a681 into master Sep 18, 2018
@andreaskurth andreaskurth deleted the rel-v1.0.1-rc2 branch September 19, 2018 15:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants