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

IDR 0.4.4 merge branch #50

Closed
wants to merge 6 commits into from
Closed

IDR 0.4.4 merge branch #50

wants to merge 6 commits into from

Conversation

manics
Copy link
Contributor

@manics manics commented Aug 25, 2017

This will be split into separate PRs.

--on-hold
--exclude

Main changes:

@IDR IDR deleted a comment from snoopycrimecop Sep 11, 2017
@IDR IDR deleted a comment from snoopycrimecop Sep 11, 2017
@IDR IDR deleted a comment from snoopycrimecop Sep 11, 2017
@IDR IDR deleted a comment from snoopycrimecop Sep 11, 2017
@IDR IDR deleted a comment from snoopycrimecop Sep 11, 2017
@IDR IDR deleted a comment from snoopycrimecop Sep 11, 2017
@sbesson
Copy link
Member

sbesson commented Nov 29, 2017

Most open PRs targeted at IDR 0.4.4 have been integrated. Is this merge branch still necessary?

@jburel
Copy link
Member

jburel commented Dec 1, 2017

Are the new files in this PR needed to be added to master?

  • ansible/experimental-omero-web-addons.yml (replacement for fp-bioimage)
  • ansible/grafana-dashboards/idr-postgresql.json

What about the changes in ansible/idr-09-monitoring.yml and ansible/management-grafana.yml
Do they need to be included?

@manics
Copy link
Contributor Author

manics commented Dec 1, 2017

Thanks for checking, I've rebased this and added the remaining commits to:

@jburel
Copy link
Member

jburel commented Dec 2, 2017

General question: how do we know that there are not other commits used for deployment that have been forgotten?

@manics
Copy link
Contributor Author

manics commented Dec 4, 2017

Same as before, diff master against this branch?

@jburel
Copy link
Member

jburel commented Dec 4, 2017

The question is more: do we have other ways to validate that the diff?
At the moment, there is none (which is fine) Trying to get my head around everything

@sbesson
Copy link
Member

sbesson commented Dec 4, 2017

@manics
Copy link
Contributor Author

manics commented Dec 4, 2017

Isn't that in #70 ?

@sbesson
Copy link
Member

sbesson commented Dec 4, 2017

👍 GitHub branch comparison API has limitations when comparing differences between 2 integrations branchess but a manual git diff shows the two branches have no differences.

@sbesson
Copy link
Member

sbesson commented Dec 5, 2017

All PRs have now been integrated into master. Closing this.

@sbesson sbesson closed this Dec 5, 2017
@manics manics deleted the idr-0-4-4 branch December 6, 2017 15:20
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.

3 participants