-
Notifications
You must be signed in to change notification settings - Fork 103
Rebase of checksum work onto develop #905
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
Conversation
|
Conflicting PR. Removed from build OMERO-merge-develop#193. See the console output for more details. |
|
This doesn't merge well with #881 still open. I will have to wait till that one goes into |
|
Conflicting PR. Removed from build OMERO-merge-develop#194. See the console output for more details. |
|
Conflicting PR. Removed from build OMERO-merge-develop#195. See the console output for more details. |
|
You should be able to merge in develop or rebase now, @bpindelski. |
|
Importing and setting in originalfile table all looks correct. None of the Spring configuration files looks obviously wrong. Both |
Rebase of checksum work onto develop
This PR is a manual rebase of #788, #827 and #897 onto develop, sprinkled with a couple of extra commits accommodating the differences caused by FS work and a cherry-pick of two commits by @mtbc from #890.
The server builds fine and imports images ok.
/build.py -f components/common/build.xml clean install test-compile integrationdoesn't fail. The Spring context wiring would need a second pair of eyes to look at (no startup errors though).